From 93e7d719a81fee0db977895b53aa3518f19eda0f Mon Sep 17 00:00:00 2001 From: Michal Nasiadka Date: Mon, 20 Apr 2026 11:25:50 +0200 Subject: CI: Fix ovn-upgrade jobs Since we use the same globals before upgrade and after upgrade, we need to not enable vpnaas before the upgrade, because there's no additional logic for configuring neutron-ovn-vpn-agent in previous release. Rename the role under /roles to fit out naming and ensure no clashes with other role names Change-Id: I3ccef6b1e75224a60036e9bf49500804ee76eba6 Signed-off-by: Michal Nasiadka --- tests/run.yml | 3 ++- tests/templates/globals-default.j2 | 2 ++ 2 files changed, 4 insertions(+), 1 deletion(-) (limited to 'tests') diff --git a/tests/run.yml b/tests/run.yml index 775eb2630..8dd6c62c6 100644 --- a/tests/run.yml +++ b/tests/run.yml @@ -431,8 +431,9 @@ - name: Test OVN VPNaaS import_role: - name: test-ovn-vpnaas + name: kolla-ansible-test-ovn-vpnaas when: + - not is_upgrade - scenario == 'ovn' # FIXME(neutron): Enable when https://bugs.launchpad.net/neutron/+bug/2146308 is fixed - not (ansible_facts.os_family == 'RedHat' and ansible_facts.distribution_major_version == '10') diff --git a/tests/templates/globals-default.j2 b/tests/templates/globals-default.j2 index 5ed942810..f5f005acd 100644 --- a/tests/templates/globals-default.j2 +++ b/tests/templates/globals-default.j2 @@ -195,7 +195,9 @@ neutron_plugin_agent: "ovn" neutron_ovn_distributed_fip: "yes" neutron_enable_ovn_agent: "yes" ovn_sb_db_relay_count: "3" +{% if not is_upgrade %} enable_neutron_vpnaas: "yes" +{% endif %} enable_octavia: "yes" octavia_provider_drivers: "ovn:OVN provider" octavia_provider_agents: "ovn" -- cgit v1.2.3