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

ansible/group_vars/all.yml

@@ -1246,7 +1246,7 @@ swift_public_endpoint: "{{ public_protocol }}://{{ swift_external_fqdn | put_add
 # Whether to run Kolla-Ansible's automatic configuration for Octavia.
 # NOTE: if you upgrade from Ussuri, you must set `octavia_auto_configure` to `no`
 # 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 ]
 # * tenant indicates that we will create a tenant network and a network

tests/templates/globals-default.j2

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