Commit 52e53ce7 authored by Jimmy McCrory's avatar Jimmy McCrory
Browse files

Rename deprecated neutron network config options

The 'provisioning_network_uuid' and 'cleaning_network_uuid' options have
been deprecated for 'provisioning_network' and 'cleaning_network'
respectively.

These options now allow either a network UUID or name. The tasks to
determine a UUID from a given network name should no longer be
necessary, but if a deployer provides a UUID prioritize that over the
name within the ironic.conf template.

Change-Id: I85f197e56ced6a73dd470c0625b6d9b5958f5159
parent b5741939
---
# Copyright 2016, Rackspace US, Inc.
#
# Licensed under the Apache License, Version 2.0 (the "License");
# you may not use this file except in compliance with the License.
# You may obtain a copy of the License at
#
# http://www.apache.org/licenses/LICENSE-2.0
#
# Unless required by applicable law or agreed to in writing, software
# distributed under the License is distributed on an "AS IS" BASIS,
# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
# See the License for the specific language governing permissions and
# limitations under the License.
- name: Install neutronclient
pip:
name: python-neutronclient
state: "{{ ironic_pip_package_state }}"
extra_args: "{{ pip_install_options | default('') }}"
register: install_packages
until: install_packages|success
retries: 5
delay: 2
- name: Create neutron network
neutron:
command: get_networks
net_name: "{{ ironic_neutron_provisioning_network_name }}"
openrc_path: /root/openrc
- name: Set provisioning UUID fact
set_fact:
ironic_neutron_provisioning_network_uuid: "{{ neutron_networks[ironic_neutron_provisioning_network_name].id }}"
- name: Set cleaning UUID fact
set_fact:
ironic_neutron_cleaning_network_uuid: "{{ neutron_networks[ironic_neutron_cleaning_network_name].id"
when:
- ironic_neutron_cleaning_network_name is defined
- ironic_neutron_cleaning_network_uuid is not defined
......@@ -102,14 +102,6 @@
tags:
- always
# Get the cleaning/provisioning network UUIDs
- include: ironic_get_neutron_uuids.yml
when:
- ironic_neutron_provisioning_network_uuid is not defined
- ironic_neutron_provisioning_network_name is defined
tags:
- always
- name: Generate ironic config
config_template:
src: "{{ item.src }}"
......
......@@ -115,8 +115,8 @@ project_domain_name = {{ neutron_service_domain_name |default("Default") }}
auth_url = {{ keystone_service_adminurl }}
insecure = {{ keystone_service_adminuri_insecure | bool }}
{% if ironic_neutron_provisioning_network_name is defined %}
provisioning_network_uuid = {{ ironic_neutron_provisioning_network_uuid | default('') }}
cleaning_network_uuid = {{ ironic_neutron_cleaning_network_uuid | default(ironic_neutron_provisioning_network_uuid | default('')) }}
provisioning_network = {{ ironic_neutron_provisioning_network_uuid | default(ironic_neutron_provisioning_network_name) | default('') }}
cleaning_network = {{ ironic_neutron_cleaning_network_uuid | default(ironic_neutron_cleaning_network_name) | default(ironic_neutron_provisioning_network_uuid) | default(ironic_neutron_provisioning_network_name) | default('') }}
{% endif %}
[oneview]
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment