openstack/kolla-ansible
Code Issues Proposed changes

Merge "octavia: run auto_configure only when amphora is enabled"

Browse Source
This commit is contained in:
Zuul 2022-11-10 12:14:49 +00:00 committed by Gerrit Code Review
commit a0fc5c5205
2 changed files with 1 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
ansible/group_vars/all.yml
View File

@ -1246,7 +1246,7 @@ swift_public_endpoint: "{{ public_protocol }}://{{ swift_external_fqdn | put_add
# Whether to run Kolla-Ansible's automatic configuration for Octavia. # Whether to run Kolla-Ansible's automatic configuration for Octavia.
# NOTE: if you upgrade from Ussuri, you must set `octavia_auto_configure` to `no` # NOTE: if you upgrade from Ussuri, you must set `octavia_auto_configure` to `no`
# and keep your other Octavia config like before. # and keep your other Octavia config like before.
octavia_auto_configure: yes octavia_auto_configure: "{{ 'amphora' in octavia_provider_drivers }}"
# Octavia network type options are [ tenant, provider ] # Octavia network type options are [ tenant, provider ]
# * tenant indicates that we will create a tenant network and a network # * tenant indicates that we will create a tenant network and a network

1
tests/templates/globals-default.j2
View File

@ -156,7 +156,6 @@ libvirt_tls: "yes"
neutron_plugin_agent: "ovn" neutron_plugin_agent: "ovn"
neutron_ovn_distributed_fip: "yes" neutron_ovn_distributed_fip: "yes"
enable_octavia: "yes" enable_octavia: "yes"
octavia_auto_configure: "no"
octavia_provider_drivers: "ovn:OVN provider" octavia_provider_drivers: "ovn:OVN provider"
octavia_provider_agents: "ovn" octavia_provider_agents: "ovn"
{% endif %} {% endif %}