From bd496808c9fbe25a1611ea2af36f8bf7760539fa Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Micha=C5=82=20Nasiadka?= Date: Mon, 29 Mar 2021 17:17:32 +0200 Subject: [PATCH] CI: Disable amphora in OVN jobs Change-Id: Ie9e2463a1b405453c8ae7caaee6ad57e0562ee47 --- tests/run.yml | 2 +- tests/templates/globals-default.j2 | 3 +++ 2 files changed, 4 insertions(+), 1 deletion(-) diff --git a/tests/run.yml b/tests/run.yml index c9501230fc..8df0ed1b5d 100644 --- a/tests/run.yml +++ b/tests/run.yml @@ -269,7 +269,7 @@ # same host being used by both) - name: create TLS certificates for octavia command: kolla-ansible octavia-certificates - when: scenario in ['octavia', 'ovn'] + when: scenario in ['octavia'] # NOTE(mgoddard): We are using the script module here and later to ensure # we use the local copy of these scripts, rather than the one on the remote diff --git a/tests/templates/globals-default.j2 b/tests/templates/globals-default.j2 index f1ea84d3f0..65d5c71f7e 100644 --- a/tests/templates/globals-default.j2 +++ b/tests/templates/globals-default.j2 @@ -157,6 +157,9 @@ neutron_plugin_agent: "linuxbridge" 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 %} {% if scenario == "prometheus-efk" %}