Merge "Support older Octavia var names in Antelope" into stable/2023.1

Author: Zuul

ansible/roles/octavia/tasks/get_resources_info.yml

@@ -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 }}"

ansible/roles/octavia/templates/octavia.conf.j2

@@ -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 %}
 

releasenotes/notes/fix-octavia-antelope-gen-config-e3f2b79c142c659e.yaml

@@ -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>`__