From 587f5382de6256a736d2166f28faa604512a7183 Mon Sep 17 00:00:00 2001 From: Michal Nasiadka Date: Fri, 28 Oct 2022 11:59:24 +0200 Subject: [PATCH] octavia: run auto_configure only when amphora is enabled Change-Id: I87845ec386fda3c6582abad37ae7d8600f222000 --- ansible/group_vars/all.yml | 2 +- tests/templates/globals-default.j2 | 1 - 2 files changed, 1 insertion(+), 2 deletions(-) diff --git a/ansible/group_vars/all.yml b/ansible/group_vars/all.yml index 7016426704..3815ac4bff 100644 --- a/ansible/group_vars/all.yml +++ b/ansible/group_vars/all.yml @@ -1242,7 +1242,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 diff --git a/tests/templates/globals-default.j2 b/tests/templates/globals-default.j2 index c71bbff2c8..c06c8a0224 100644 --- a/tests/templates/globals-default.j2 +++ b/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 %}