Merge "[OVN] Use the OVN agent in "neutron-tempest-plugin-ovn""
diff --git a/zuul.d/2023_1_jobs.yaml b/zuul.d/2023_1_jobs.yaml
index b9f293f..6bf7027 100644
--- a/zuul.d/2023_1_jobs.yaml
+++ b/zuul.d/2023_1_jobs.yaml
@@ -214,6 +214,9 @@
(^neutron_tempest_plugin.scenario.test_mtu.NetworkWritableMtuTest)"
devstack_localrc:
NETWORK_API_EXTENSIONS: "{{ (network_api_extensions_common + network_api_extensions_ovn) | join(',') }}"
+ devstack_services:
+ q-ovn-metadata-agent: true
+ q-ovn-agent: false
devstack_local_conf:
test-config:
$TEMPEST_CONFIG:
diff --git a/zuul.d/2023_2_jobs.yaml b/zuul.d/2023_2_jobs.yaml
index f5ece3d..87092a9 100644
--- a/zuul.d/2023_2_jobs.yaml
+++ b/zuul.d/2023_2_jobs.yaml
@@ -209,6 +209,9 @@
(^neutron_tempest_plugin.scenario.test_mtu.NetworkWritableMtuTest)"
devstack_localrc:
NETWORK_API_EXTENSIONS: "{{ (network_api_extensions_common + network_api_extensions_ovn) | join(',') }}"
+ devstack_services:
+ q-ovn-metadata-agent: true
+ q-ovn-agent: false
devstack_local_conf:
test-config:
$TEMPEST_CONFIG:
diff --git a/zuul.d/master_jobs.yaml b/zuul.d/master_jobs.yaml
index 6b41f87..d7b6732 100644
--- a/zuul.d/master_jobs.yaml
+++ b/zuul.d/master_jobs.yaml
@@ -603,6 +603,7 @@
(^neutron_tempest_plugin.scenario.test_mtu.NetworkWritableMtuTest)"
devstack_localrc:
Q_AGENT: ovn
+ OVN_AGENT_EXTENSIONS: 'metadata'
NETWORK_API_EXTENSIONS: "{{ (network_api_extensions_common + network_api_extensions_ovn) | join(',') }}"
Q_ML2_PLUGIN_MECHANISM_DRIVERS: ovn,logger
Q_ML2_PLUGIN_TYPE_DRIVERS: local,flat,vlan,geneve
@@ -624,7 +625,8 @@
devstack_services:
br-ex-tcpdump: true
br-int-flows: true
- q-ovn-metadata-agent: true
+ q-ovn-metadata-agent: false
+ q-ovn-agent: true
ovn-controller: true
ovn-northd: true
ovs-vswitchd: true
diff --git a/zuul.d/victoria_jobs.yaml b/zuul.d/victoria_jobs.yaml
index 1f611db..7e2549f 100644
--- a/zuul.d/victoria_jobs.yaml
+++ b/zuul.d/victoria_jobs.yaml
@@ -240,6 +240,9 @@
CUSTOMIZE_IMAGE: false
OVN_BRANCH: "v21.06.0"
OVS_BRANCH: "a4b04276ab5934d087669ff2d191a23931335c87"
+ devstack_services:
+ q-ovn-metadata-agent: true
+ q-ovn-agent: false
devstack_local_conf:
test-config:
$TEMPEST_CONFIG:
diff --git a/zuul.d/wallaby_jobs.yaml b/zuul.d/wallaby_jobs.yaml
index 92a3e50..8a771b8 100644
--- a/zuul.d/wallaby_jobs.yaml
+++ b/zuul.d/wallaby_jobs.yaml
@@ -177,6 +177,9 @@
NETWORK_API_EXTENSIONS: "{{ network_api_extensions | join(',') }}"
OVN_BRANCH: "v21.06.0"
OVS_BRANCH: "a4b04276ab5934d087669ff2d191a23931335c87"
+ devstack_services:
+ q-ovn-metadata-agent: true
+ q-ovn-agent: false
devstack_local_conf:
test-config:
$TEMPEST_CONFIG:
diff --git a/zuul.d/xena_jobs.yaml b/zuul.d/xena_jobs.yaml
index 25d63a9..9f8e960 100644
--- a/zuul.d/xena_jobs.yaml
+++ b/zuul.d/xena_jobs.yaml
@@ -170,6 +170,9 @@
network_api_extensions: *api_extensions
devstack_localrc:
NETWORK_API_EXTENSIONS: "{{ network_api_extensions | join(',') }}"
+ devstack_services:
+ q-ovn-metadata-agent: true
+ q-ovn-agent: false
devstack_local_conf:
test-config:
$TEMPEST_CONFIG:
diff --git a/zuul.d/yoga_jobs.yaml b/zuul.d/yoga_jobs.yaml
index 8951943..76cac3e 100644
--- a/zuul.d/yoga_jobs.yaml
+++ b/zuul.d/yoga_jobs.yaml
@@ -180,6 +180,9 @@
- vlan-transparent
devstack_localrc:
NETWORK_API_EXTENSIONS: "{{ (network_api_extensions + network_api_extensions_ovn) | join(',') }}"
+ devstack_services:
+ q-ovn-metadata-agent: true
+ q-ovn-agent: false
devstack_local_conf:
test-config:
$TEMPEST_CONFIG:
diff --git a/zuul.d/zed_jobs.yaml b/zuul.d/zed_jobs.yaml
index 8c70a66..7d8b2e1 100644
--- a/zuul.d/zed_jobs.yaml
+++ b/zuul.d/zed_jobs.yaml
@@ -183,6 +183,9 @@
- vlan-transparent
devstack_localrc:
NETWORK_API_EXTENSIONS: "{{ (network_api_extensions + network_api_extensions_ovn) | join(',') }}"
+ devstack_services:
+ q-ovn-metadata-agent: true
+ q-ovn-agent: false
devstack_local_conf:
test-config:
$TEMPEST_CONFIG: