Merge "Enable l3_ha in neutron config for scenario jobs"
diff --git a/zuul.d/master_jobs.yaml b/zuul.d/master_jobs.yaml
index 207a4f1..0b0f174 100644
--- a/zuul.d/master_jobs.yaml
+++ b/zuul.d/master_jobs.yaml
@@ -148,6 +148,7 @@
$NEUTRON_CONF:
DEFAULT:
enable_dvr: false
+ l3_ha: true
# NOTE(slaweq): We can get rid of this hardcoded absolute path when
# devstack-tempest job will be switched to use lib/neutron instead of
# lib/neutron-legacy
@@ -216,6 +217,7 @@
$NEUTRON_CONF:
DEFAULT:
enable_dvr: false
+ l3_ha: true
# NOTE(slaweq): We can get rid of this hardcoded absolute path when
# devstack-tempest job will be switched to use lib/neutron instead of
# lib/neutron-legacy
@@ -293,6 +295,7 @@
DEFAULT:
enable_dvr: false
vlan_transparent: true
+ l3_ha: true
AGENT:
debug_iptables_rules: true
# NOTE(slaweq): We can get rid of this hardcoded absolute path when
diff --git a/zuul.d/queens_jobs.yaml b/zuul.d/queens_jobs.yaml
index c293e7a..b4c22bc 100644
--- a/zuul.d/queens_jobs.yaml
+++ b/zuul.d/queens_jobs.yaml
@@ -124,6 +124,12 @@
branch_override: stable/queens
network_api_extensions: *api_extensions
network_available_features: *available_features
+ devstack_local_conf:
+ post-config:
+ $NEUTRON_L3_CONF:
+ DEFAULT:
+ # NOTE(slaweq): on Xenial keepalived don't knows this option yet
+ keepalived_use_no_track: False
# TODO(slaweq): remove trunks subport_connectivity test from blacklist
# when bug https://bugs.launchpad.net/neutron/+bug/1838760 will be fixed
# NOTE(bcafarel): remove DNS test as queens pinned version does not have
@@ -178,6 +184,10 @@
/$NEUTRON_CORE_PLUGIN_CONF:
ml2:
type_drivers: flat,vlan,local,vxlan
+ $NEUTRON_L3_CONF:
+ DEFAULT:
+ # NOTE(slaweq): on Xenial keepalived don't knows this option yet
+ keepalived_use_no_track: False
test-config:
# NOTE: ignores linux bridge's trunk delete on bound port test
# for rocky branch (as https://review.opendev.org/#/c/605589/
diff --git a/zuul.d/rocky_jobs.yaml b/zuul.d/rocky_jobs.yaml
index 2778873..718369a 100644
--- a/zuul.d/rocky_jobs.yaml
+++ b/zuul.d/rocky_jobs.yaml
@@ -148,6 +148,12 @@
USE_PYTHON3: false
NETWORK_API_EXTENSIONS: "{{ network_api_extensions | join(',') }}"
TEMPEST_PLUGINS: /opt/stack/neutron-tempest-plugin
+ devstack_local_conf:
+ post-config:
+ $NEUTRON_L3_CONF:
+ DEFAULT:
+ # NOTE(slaweq): on Xenial keepalived don't knows this option yet
+ keepalived_use_no_track: False
# NOTE(bcafarel): newer tests, unstable on rocky branch
tempest_black_regex: "\
(^neutron_tempest_plugin.scenario.test_port_forwardings.PortForwardingTestJSON.test_port_forwarding_to_2_servers)|\
@@ -185,6 +191,12 @@
USE_PYTHON3: false
NETWORK_API_EXTENSIONS: "{{ network_api_extensions | join(',') }}"
TEMPEST_PLUGINS: /opt/stack/neutron-tempest-plugin
+ devstack_local_conf:
+ post-config:
+ $NEUTRON_L3_CONF:
+ DEFAULT:
+ # NOTE(slaweq): on Xenial keepalived don't knows this option yet
+ keepalived_use_no_track: False
# TODO(bcafarel): remove trunks subport_connectivity test from blacklist
# when bug https://bugs.launchpad.net/neutron/+bug/1838760 will be fixed
# NOTE(bcafarel): other are newer tests, unstable on rocky branch
@@ -242,6 +254,10 @@
/$NEUTRON_CORE_PLUGIN_CONF:
ml2:
type_drivers: flat,vlan,local,vxlan
+ $NEUTRON_L3_CONF:
+ DEFAULT:
+ # NOTE(slaweq): on Xenial keepalived don't knows this option yet
+ keepalived_use_no_track: False
test-config:
# NOTE: ignores linux bridge's trunk delete on bound port test
# for rocky branch (as https://review.opendev.org/#/c/605589/
diff --git a/zuul.d/stein_jobs.yaml b/zuul.d/stein_jobs.yaml
index b053065..8db4508 100644
--- a/zuul.d/stein_jobs.yaml
+++ b/zuul.d/stein_jobs.yaml
@@ -131,6 +131,11 @@
devstack_localrc:
NETWORK_API_EXTENSIONS: "{{ network_api_extensions | join(',') }}"
devstack_local_conf:
+ post-config:
+ $NEUTRON_L3_CONF:
+ DEFAULT:
+ # NOTE(slaweq): on Bionic keepalived don't knows this option yet
+ keepalived_use_no_track: False
test-config:
$TEMPEST_CONFIG:
network-feature-enabled:
@@ -151,6 +156,11 @@
devstack_localrc:
NETWORK_API_EXTENSIONS: "{{ network_api_extensions | join(',') }}"
devstack_local_conf:
+ post-config:
+ $NEUTRON_L3_CONF:
+ DEFAULT:
+ # NOTE(slaweq): on Bionic keepalived don't knows this option yet
+ keepalived_use_no_track: False
test-config:
$TEMPEST_CONFIG:
network-feature-enabled:
@@ -171,6 +181,11 @@
devstack_localrc:
NETWORK_API_EXTENSIONS: "{{ network_api_extensions | join(',') }}"
devstack_local_conf:
+ post-config:
+ $NEUTRON_L3_CONF:
+ DEFAULT:
+ # NOTE(slaweq): on Bionic keepalived don't knows this option yet
+ keepalived_use_no_track: False
test-config:
$TEMPEST_CONFIG:
network-feature-enabled:
diff --git a/zuul.d/train_jobs.yaml b/zuul.d/train_jobs.yaml
index 7d85cdb..75c8ebe 100644
--- a/zuul.d/train_jobs.yaml
+++ b/zuul.d/train_jobs.yaml
@@ -129,6 +129,11 @@
devstack_localrc:
NETWORK_API_EXTENSIONS: "{{ network_api_extensions | join(',') }}"
devstack_local_conf:
+ post-config:
+ $NEUTRON_L3_CONF:
+ DEFAULT:
+ # NOTE(slaweq): on Bionic keepalived doesn't knows this option yet
+ keepalived_use_no_track: False
test-config:
$TEMPEST_CONFIG:
network-feature-enabled:
@@ -148,6 +153,11 @@
devstack_localrc:
NETWORK_API_EXTENSIONS: "{{ network_api_extensions | join(',') }}"
devstack_local_conf:
+ post-config:
+ $NEUTRON_L3_CONF:
+ DEFAULT:
+ # NOTE(slaweq): on Bionic keepalived don't knows this option yet
+ keepalived_use_no_track: False
test-config:
$TEMPEST_CONFIG:
network-feature-enabled:
@@ -167,6 +177,11 @@
devstack_localrc:
NETWORK_API_EXTENSIONS: "{{ network_api_extensions | join(',') }}"
devstack_local_conf:
+ post-config:
+ $NEUTRON_L3_CONF:
+ DEFAULT:
+ # NOTE(slaweq): on Bionic keepalived don't knows this option yet
+ keepalived_use_no_track: False
test-config:
$TEMPEST_CONFIG:
network-feature-enabled:
diff --git a/zuul.d/ussuri_jobs.yaml b/zuul.d/ussuri_jobs.yaml
index 641663f..aeab94f 100644
--- a/zuul.d/ussuri_jobs.yaml
+++ b/zuul.d/ussuri_jobs.yaml
@@ -134,6 +134,11 @@
devstack_localrc:
NETWORK_API_EXTENSIONS: "{{ network_api_extensions | join(',') }}"
devstack_local_conf:
+ post-config:
+ $NEUTRON_L3_CONF:
+ DEFAULT:
+ # NOTE(slaweq): on Bionic keepalived don't knows this option yet
+ keepalived_use_no_track: False
test-config:
$TEMPEST_CONFIG:
network-feature-enabled:
@@ -154,6 +159,11 @@
devstack_localrc:
NETWORK_API_EXTENSIONS: "{{ network_api_extensions | join(',') }}"
devstack_local_conf:
+ post-config:
+ $NEUTRON_L3_CONF:
+ DEFAULT:
+ # NOTE(slaweq): on Bionic keepalived don't knows this option yet
+ keepalived_use_no_track: False
test-config:
$TEMPEST_CONFIG:
network-feature-enabled:
@@ -173,6 +183,11 @@
devstack_localrc:
NETWORK_API_EXTENSIONS: "{{ network_api_extensions | join(',') }}"
devstack_local_conf:
+ post-config:
+ $NEUTRON_L3_CONF:
+ DEFAULT:
+ # NOTE(slaweq): on Bionic keepalived don't knows this option yet
+ keepalived_use_no_track: False
test-config:
$TEMPEST_CONFIG:
network-feature-enabled: