openstack/kolla-ansible
Code Issues Proposed changes

Merge "octavia: Fix hm-interface after bumping openstack collection"

Browse Source
This commit is contained in:
Zuul 2023-04-27 09:28:36 +00:00 committed by Gerrit Code Review
commit 92ddbdfbc1
4 changed files with 7 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
ansible/roles/octavia/tasks/get_resources_info.yml
View File

@ -71,5 +71,5 @@
- name: Set octavia resources facts - name: Set octavia resources facts
set_fact: set_fact:
network_info: "{{ network_results.openstack_networks.0 }}" network_info: "{{ network_results.networks | first }}"
amphora_flavor_info: "{{ flavor_results.openstack_flavors.0 }}" amphora_flavor_info: "{{ flavor_results.flavors | first }}"

4
ansible/roles/octavia/tasks/hm-interface.yml
View File

@ -22,7 +22,7 @@
- name: Update Octavia health manager port host_id - name: Update Octavia health manager port host_id
become: True become: True
vars: vars:
port_id: "{{ port_info.id }}" port_id: "{{ port_info.port.id }}"
command: > command: >
{{ kolla_container_engine }} exec kolla_toolbox openstack {{ kolla_container_engine }} exec kolla_toolbox openstack
--os-interface {{ openstack_interface }} --os-interface {{ openstack_interface }}
@ -41,7 +41,7 @@
- name: Add Octavia port to openvswitch br-int - name: Add Octavia port to openvswitch br-int
vars: vars:
port_mac: "{{ port_info.port.mac_address }}" port_mac: "{{ port_info.port.mac_address }}"
port_id: "{{ port_info.id }}" port_id: "{{ port_info.port.id }}"
become: True become: True
command: > command: >
{{ kolla_container_engine }} exec openvswitch_vswitchd ovs-vsctl --may-exist \ {{ kolla_container_engine }} exec openvswitch_vswitchd ovs-vsctl --may-exist \

4
ansible/roles/octavia/templates/octavia.conf.j2
View File

@ -101,9 +101,9 @@ amp_secgroup_list = {{ octavia_amp_secgroup_list }}
amp_flavor_id = {{ octavia_amp_flavor_id }} amp_flavor_id = {{ octavia_amp_flavor_id }}
{% endif %} {% endif %}
{% else %} {% else %}
amp_image_owner_id = {{ project_info.openstack_projects.0.id }} amp_image_owner_id = {{ project_info.projects.0.id }}
amp_boot_network_list = {{ network_info.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.secgroup.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_flavor_id = {{ amphora_flavor_info.id }} amp_flavor_id = {{ amphora_flavor_info.id }}
{% endif %} {% endif %}

2
tests/test-octavia.sh
View File

@ -10,7 +10,7 @@ export PYTHONUNBUFFERED=1
function register_amphora_image { function register_amphora_image {
amphora_url=https://tarballs.opendev.org/openstack/octavia/test-images/test-only-amphora-x64-haproxy-ubuntu-bionic.qcow2 amphora_url=https://tarballs.opendev.org/openstack/octavia/test-images/test-only-amphora-x64-haproxy-ubuntu-focal.qcow2
curl -o amphora.qcow2 $amphora_url curl -o amphora.qcow2 $amphora_url
(. /etc/kolla/octavia-openrc.sh && openstack image create amphora-x64-haproxy --file amphora.qcow2 --tag amphora --disk-format qcow2 --property hw_architecture='x86_64' --property hw_rng_model=virtio) (. /etc/kolla/octavia-openrc.sh && openstack image create amphora-x64-haproxy --file amphora.qcow2 --tag amphora --disk-format qcow2 --property hw_architecture='x86_64' --property hw_rng_model=virtio)
} }