Merge "Revert "Temporary turn off l3_ha in ovs/lb master/bobcat jobs""
diff --git a/zuul.d/2023_1_jobs.yaml b/zuul.d/2023_1_jobs.yaml
index e521c01..b9f293f 100644
--- a/zuul.d/2023_1_jobs.yaml
+++ b/zuul.d/2023_1_jobs.yaml
@@ -96,10 +96,6 @@
devstack_localrc:
NETWORK_API_EXTENSIONS: "{{ (network_api_extensions_common + network_api_extensions_openvswitch) | join(',') }}"
devstack_local_conf:
- post-config:
- $NEUTRON_CONF:
- DEFAULT:
- l3_ha: true
test-config:
$TEMPEST_CONFIG:
network-feature-enabled:
@@ -134,10 +130,6 @@
devstack_localrc:
NETWORK_API_EXTENSIONS: "{{ (network_api_extensions_common + network_api_extensions_openvswitch) | join(',') }}"
devstack_local_conf:
- post-config:
- $NEUTRON_CONF:
- DEFAULT:
- l3_ha: true
test-config:
$TEMPEST_CONFIG:
network-feature-enabled:
@@ -195,10 +187,6 @@
devstack_localrc:
NETWORK_API_EXTENSIONS: "{{ (network_api_extensions_common + network_api_extensions_linuxbridge) | join(',') }}"
devstack_local_conf:
- post-config:
- $NEUTRON_CONF:
- DEFAULT:
- l3_ha: true
test-config:
$TEMPEST_CONFIG:
network-feature-enabled:
diff --git a/zuul.d/master_jobs.yaml b/zuul.d/master_jobs.yaml
index e33a2ef..58fc684 100644
--- a/zuul.d/master_jobs.yaml
+++ b/zuul.d/master_jobs.yaml
@@ -255,8 +255,7 @@
$NEUTRON_CONF:
DEFAULT:
enable_dvr: false
- # TODO(ykarel) Turn on once https://bugs.launchpad.net/neutron/+bug/2037239 fixed
- l3_ha: false
+ l3_ha: true
/$NEUTRON_CORE_PLUGIN_CONF:
agent:
tunnel_types: vxlan,gre
@@ -358,8 +357,7 @@
$NEUTRON_CONF:
DEFAULT:
enable_dvr: false
- # TODO(ykarel) Turn on once https://bugs.launchpad.net/neutron/+bug/2037239 fixed
- l3_ha: false
+ l3_ha: true
/$NEUTRON_CORE_PLUGIN_CONF:
agent:
tunnel_types: vxlan,gre
@@ -532,8 +530,7 @@
DEFAULT:
enable_dvr: false
vlan_transparent: true
- # TODO(ykarel) Turn on once https://bugs.launchpad.net/neutron/+bug/2037239 fixed
- l3_ha: false
+ l3_ha: true
AGENT:
debug_iptables_rules: true
EXPERIMENTAL:
diff --git a/zuul.d/train_jobs.yaml b/zuul.d/train_jobs.yaml
index 5b1d354..159feb2 100644
--- a/zuul.d/train_jobs.yaml
+++ b/zuul.d/train_jobs.yaml
@@ -154,9 +154,6 @@
DEFAULT:
# NOTE(slaweq): on Bionic keepalived doesn't knows this option yet
keepalived_use_no_track: False
- $NEUTRON_CONF:
- DEFAULT:
- l3_ha: true
test-config:
$TEMPEST_CONFIG:
network-feature-enabled:
@@ -191,9 +188,6 @@
DEFAULT:
# NOTE(slaweq): on Bionic keepalived don't knows this option yet
keepalived_use_no_track: False
- $NEUTRON_CONF:
- DEFAULT:
- l3_ha: true
test-config:
$TEMPEST_CONFIG:
network-feature-enabled:
@@ -228,9 +222,6 @@
DEFAULT:
# NOTE(slaweq): on Bionic keepalived don't knows this option yet
keepalived_use_no_track: False
- $NEUTRON_CONF:
- DEFAULT:
- l3_ha: true
test-config:
$TEMPEST_CONFIG:
network-feature-enabled:
diff --git a/zuul.d/ussuri_jobs.yaml b/zuul.d/ussuri_jobs.yaml
index 81da9af..5abc741 100644
--- a/zuul.d/ussuri_jobs.yaml
+++ b/zuul.d/ussuri_jobs.yaml
@@ -159,9 +159,6 @@
DEFAULT:
# NOTE(slaweq): on Bionic keepalived don't knows this option yet
keepalived_use_no_track: False
- $NEUTRON_CONF:
- DEFAULT:
- l3_ha: true
test-config:
$TEMPEST_CONFIG:
network-feature-enabled:
@@ -194,9 +191,6 @@
DEFAULT:
# NOTE(slaweq): on Bionic keepalived don't knows this option yet
keepalived_use_no_track: False
- $NEUTRON_CONF:
- DEFAULT:
- l3_ha: true
test-config:
$TEMPEST_CONFIG:
network-feature-enabled:
@@ -224,9 +218,6 @@
DEFAULT:
# NOTE(slaweq): on Bionic keepalived don't knows this option yet
keepalived_use_no_track: False
- $NEUTRON_CONF:
- DEFAULT:
- l3_ha: true
test-config:
$TEMPEST_CONFIG:
network-feature-enabled:
diff --git a/zuul.d/victoria_jobs.yaml b/zuul.d/victoria_jobs.yaml
index ca5ae6b..1f611db 100644
--- a/zuul.d/victoria_jobs.yaml
+++ b/zuul.d/victoria_jobs.yaml
@@ -152,10 +152,6 @@
ADVANCED_INSTANCE_USER: ubuntu
CUSTOMIZE_IMAGE: false
devstack_local_conf:
- post-config:
- $NEUTRON_CONF:
- DEFAULT:
- l3_ha: true
test-config:
$TEMPEST_CONFIG:
network-feature-enabled:
@@ -188,10 +184,6 @@
ADVANCED_INSTANCE_USER: ubuntu
CUSTOMIZE_IMAGE: false
devstack_local_conf:
- post-config:
- $NEUTRON_CONF:
- DEFAULT:
- l3_ha: true
test-config:
$TEMPEST_CONFIG:
network-feature-enabled:
@@ -220,10 +212,6 @@
ADVANCED_INSTANCE_USER: ubuntu
CUSTOMIZE_IMAGE: false
devstack_local_conf:
- post-config:
- $NEUTRON_CONF:
- DEFAULT:
- l3_ha: true
test-config:
$TEMPEST_CONFIG:
network-feature-enabled:
diff --git a/zuul.d/wallaby_jobs.yaml b/zuul.d/wallaby_jobs.yaml
index c40ec37..92a3e50 100644
--- a/zuul.d/wallaby_jobs.yaml
+++ b/zuul.d/wallaby_jobs.yaml
@@ -110,10 +110,6 @@
devstack_localrc:
NETWORK_API_EXTENSIONS: "{{ network_api_extensions | join(',') }}"
devstack_local_conf:
- post-config:
- $NEUTRON_CONF:
- DEFAULT:
- l3_ha: true
test-config:
$TEMPEST_CONFIG:
network-feature-enabled:
@@ -141,10 +137,6 @@
devstack_localrc:
NETWORK_API_EXTENSIONS: "{{ network_api_extensions | join(',') }}"
devstack_local_conf:
- post-config:
- $NEUTRON_CONF:
- DEFAULT:
- l3_ha: true
test-config:
$TEMPEST_CONFIG:
network-feature-enabled:
@@ -165,10 +157,6 @@
devstack_localrc:
NETWORK_API_EXTENSIONS: "{{ network_api_extensions | join(',') }}"
devstack_local_conf:
- post-config:
- $NEUTRON_CONF:
- DEFAULT:
- l3_ha: true
test-config:
$TEMPEST_CONFIG:
network-feature-enabled:
diff --git a/zuul.d/xena_jobs.yaml b/zuul.d/xena_jobs.yaml
index 3c86d53..25d63a9 100644
--- a/zuul.d/xena_jobs.yaml
+++ b/zuul.d/xena_jobs.yaml
@@ -112,10 +112,6 @@
devstack_localrc:
NETWORK_API_EXTENSIONS: "{{ network_api_extensions | join(',') }}"
devstack_local_conf:
- post-config:
- $NEUTRON_CONF:
- DEFAULT:
- l3_ha: true
test-config:
$TEMPEST_CONFIG:
network-feature-enabled:
@@ -136,10 +132,6 @@
devstack_localrc:
NETWORK_API_EXTENSIONS: "{{ network_api_extensions | join(',') }}"
devstack_local_conf:
- post-config:
- $NEUTRON_CONF:
- DEFAULT:
- l3_ha: true
test-config:
$TEMPEST_CONFIG:
network-feature-enabled:
@@ -160,10 +152,6 @@
devstack_localrc:
NETWORK_API_EXTENSIONS: "{{ network_api_extensions | join(',') }}"
devstack_local_conf:
- post-config:
- $NEUTRON_CONF:
- DEFAULT:
- l3_ha: true
test-config:
$TEMPEST_CONFIG:
network-feature-enabled:
diff --git a/zuul.d/yoga_jobs.yaml b/zuul.d/yoga_jobs.yaml
index 76a24fc..04c9ddd 100644
--- a/zuul.d/yoga_jobs.yaml
+++ b/zuul.d/yoga_jobs.yaml
@@ -109,10 +109,6 @@
devstack_localrc:
NETWORK_API_EXTENSIONS: "{{ (network_api_extensions + network_api_extensions_openvswitch) | join(',') }}"
devstack_local_conf:
- post-config:
- $NEUTRON_CONF:
- DEFAULT:
- l3_ha: true
test-config:
$TEMPEST_CONFIG:
network-feature-enabled:
@@ -133,10 +129,6 @@
devstack_localrc:
NETWORK_API_EXTENSIONS: "{{ (network_api_extensions + network_api_extensions_openvswitch) | join(',') }}"
devstack_local_conf:
- post-config:
- $NEUTRON_CONF:
- DEFAULT:
- l3_ha: true
test-config:
$TEMPEST_CONFIG:
network-feature-enabled:
@@ -157,10 +149,6 @@
devstack_localrc:
NETWORK_API_EXTENSIONS: "{{ network_api_extensions | join(',') }}"
devstack_local_conf:
- post-config:
- $NEUTRON_CONF:
- DEFAULT:
- l3_ha: true
test-config:
$TEMPEST_CONFIG:
network-feature-enabled:
diff --git a/zuul.d/zed_jobs.yaml b/zuul.d/zed_jobs.yaml
index 1318586..8c70a66 100644
--- a/zuul.d/zed_jobs.yaml
+++ b/zuul.d/zed_jobs.yaml
@@ -98,10 +98,6 @@
devstack_localrc:
NETWORK_API_EXTENSIONS: "{{ (network_api_extensions_common + network_api_extensions_openvswitch) | join(',') }}"
devstack_local_conf:
- post-config:
- $NEUTRON_CONF:
- DEFAULT:
- l3_ha: true
test-config:
$TEMPEST_CONFIG:
network-feature-enabled:
@@ -136,10 +132,6 @@
devstack_localrc:
NETWORK_API_EXTENSIONS: "{{ (network_api_extensions_common + network_api_extensions_openvswitch) | join(',') }}"
devstack_local_conf:
- post-config:
- $NEUTRON_CONF:
- DEFAULT:
- l3_ha: true
test-config:
$TEMPEST_CONFIG:
network-feature-enabled:
@@ -168,10 +160,6 @@
devstack_localrc:
NETWORK_API_EXTENSIONS: "{{ (network_api_extensions_common + network_api_extensions_linuxbridge) | join(',') }}"
devstack_local_conf:
- post-config:
- $NEUTRON_CONF:
- DEFAULT:
- l3_ha: true
test-config:
$TEMPEST_CONFIG:
network-feature-enabled: