From eec75f412c7b9ef061a8d71a2c20d1c7d9331e7e Mon Sep 17 00:00:00 2001 From: =?utf8?q?C=C3=A9dric=20Ollivier?= Date: Fri, 4 Dec 2020 13:01:32 +0100 Subject: [PATCH] Stop setting floating_ips in tempest_conf.yaml MIME-Version: 1.0 Content-Type: text/plain; charset=utf8 Content-Transfer-Encoding: 8bit It's now handled by tempest.py Change-Id: Iaeefd70f95a3c64c7ca41b984e934c4aeadea8ab Signed-off-by: Cédric Ollivier (cherry picked from commit 47e7b7c59998dfaa76ac8e4c48b47a75538ac90a) --- docker/smoke-cntt/tempest_conf.yaml | 1 - functest/opnfv_tests/openstack/tempest/custom_tests/tempest_conf.yaml | 1 - .../opnfv_tests/openstack/tempest/custom_tests/tempest_conf_ovn.yaml | 1 - functest/opnfv_tests/openstack/tempest/tempest.py | 1 + 4 files changed, 1 insertion(+), 3 deletions(-) diff --git a/docker/smoke-cntt/tempest_conf.yaml b/docker/smoke-cntt/tempest_conf.yaml index 022f0fee3..cb63bd00b 100644 --- a/docker/smoke-cntt/tempest_conf.yaml +++ b/docker/smoke-cntt/tempest_conf.yaml @@ -52,7 +52,6 @@ image-feature-enabled: network-feature-enabled: port_admin_state_change: true port_security: true - floating_ips: true placement: max_microversion: 1.36 validation: diff --git a/functest/opnfv_tests/openstack/tempest/custom_tests/tempest_conf.yaml b/functest/opnfv_tests/openstack/tempest/custom_tests/tempest_conf.yaml index 1bf1d7a3a..ac09ffc5b 100644 --- a/functest/opnfv_tests/openstack/tempest/custom_tests/tempest_conf.yaml +++ b/functest/opnfv_tests/openstack/tempest/custom_tests/tempest_conf.yaml @@ -52,7 +52,6 @@ image-feature-enabled: network-feature-enabled: port_admin_state_change: true port_security: true - floating_ips: true placement: max_microversion: 1.36 validation: diff --git a/functest/opnfv_tests/openstack/tempest/custom_tests/tempest_conf_ovn.yaml b/functest/opnfv_tests/openstack/tempest/custom_tests/tempest_conf_ovn.yaml index bae26c1c7..131b9dc8e 100644 --- a/functest/opnfv_tests/openstack/tempest/custom_tests/tempest_conf_ovn.yaml +++ b/functest/opnfv_tests/openstack/tempest/custom_tests/tempest_conf_ovn.yaml @@ -52,7 +52,6 @@ image-feature-enabled: network-feature-enabled: port_admin_state_change: true port_security: true - floating_ips: true placement: max_microversion: 1.36 validation: diff --git a/functest/opnfv_tests/openstack/tempest/tempest.py b/functest/opnfv_tests/openstack/tempest/tempest.py index ed3c4761f..c1c6b8944 100644 --- a/functest/opnfv_tests/openstack/tempest/tempest.py +++ b/functest/opnfv_tests/openstack/tempest/tempest.py @@ -507,6 +507,7 @@ class TempestCommon(singlevm.VmReady2): rconfig.add_section('network') rconfig.set('network', 'public_network_id', self.ext_net.id) rconfig.set('network', 'floating_network_name', self.ext_net.name) + rconfig.set('network-feature-enabled', 'floating_ips', True) else: if not rconfig.has_section('network-feature-enabled'): rconfig.add_section('network-feature-enabled') -- 2.16.6