Support older Octavia var names in Antelope
Allows config to be generated for the Antelope release while the Zed Kolla-Toolbox container is deployed. This is useful when checking generated configuration before upgrading from Zed to Antelope. Closes-Bug: #2049364 Change-Id: I2710805c781d6c3447fb3a50505595dc9bfc6e42
This commit is contained in:
parent
918728ead7
commit
0d51e42569
|
@ -71,5 +71,5 @@
|
|||
|
||||
- name: Set octavia resources facts
|
||||
set_fact:
|
||||
network_info: "{{ network_results.networks | first }}"
|
||||
amphora_flavor_info: "{{ flavor_results.flavors | first }}"
|
||||
network_info: "{{ network_results.networks | default(network_results.openstack_networks) | first }}"
|
||||
amphora_flavor_info: "{{ flavor_results.flavors | default(flavor_results.openstack_flavors) | first }}"
|
||||
|
|
|
@ -101,9 +101,9 @@ amp_secgroup_list = {{ octavia_amp_secgroup_list }}
|
|||
amp_flavor_id = {{ octavia_amp_flavor_id }}
|
||||
{% endif %}
|
||||
{% else %}
|
||||
amp_image_owner_id = {{ project_info.projects.0.id }}
|
||||
amp_image_owner_id = {{ project_info.projects.0.id | default(project_info.openstack_projects.0.id) }}
|
||||
amp_boot_network_list = {{ network_info.id }}
|
||||
amp_secgroup_list = {{ (sec_grp_info.results | selectattr('item.name', 'equalto', octavia_amp_security_groups['mgmt-sec-grp'].name) | list).0.security_group.id }}
|
||||
amp_secgroup_list = {{ (sec_grp_info.results | selectattr('item.name', 'equalto', octavia_amp_security_groups['mgmt-sec-grp'].name) | list).0.security_group.id | default((sec_grp_info.results | selectattr('item.name', 'equalto', octavia_amp_security_groups['mgmt-sec-grp'].name) | list).0.secgroup.id) }}
|
||||
amp_flavor_id = {{ amphora_flavor_info.id }}
|
||||
{% endif %}
|
||||
|
||||
|
|
|
@ -0,0 +1,6 @@
|
|||
---
|
||||
fixes:
|
||||
- |
|
||||
Fixes a bug where Octavia configuration couldn't be generated for Antelope
|
||||
release while running Zed release kolla toolbox.
|
||||
`LP#2049364 <https://launchpad.net/bugs/2049364>`__
|
Loading…
Reference in New Issue