diff options
| author |   Cédric Ollivier <cedric.ollivier@orange.com> | 2020-12-04 13:01:32 +0100 |
|---|---|---|
| committer | Cédric Ollivier <cedric.ollivier@orange.com> | 2020-12-04 13:08:04 +0100 |
| commit | 76ca22bdccd82de1c736401b34477306c078c9f9 (patch) | |
| tree | 8597f5bcfd7971aadf3cd8f8d9d4dcb0959bfbae | |
| parent | 04a5953273a67c5d25413097a6b105e7ea35d05b (diff) | |
Stop setting floating_ips in tempest_conf.yaml
It's now handled by tempest.py
Change-Id: Iaeefd70f95a3c64c7ca41b984e934c4aeadea8ab
Signed-off-by: Cédric Ollivier <cedric.ollivier@orange.com>
(cherry picked from commit 47e7b7c59998dfaa76ac8e4c48b47a75538ac90a)
4 files changed, 1 insertions, 3 deletions
diff --git a/docker/smoke-cntt/tempest_conf.yaml b/docker/smoke-cntt/tempest_conf.yaml index c9d73f487..f11f91bf7 100644 --- a/docker/smoke-cntt/tempest_conf.yaml +++ b/docker/smoke-cntt/tempest_conf.yaml @@ -53,7 +53,6 @@ image-feature-enabled: network-feature-enabled: port_admin_state_change: true port_security: true - floating_ips: true placement: max_microversion: "1.10" 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 244037203..bcf736d4e 100644 --- a/functest/opnfv_tests/openstack/tempest/custom_tests/tempest_conf.yaml +++ b/functest/opnfv_tests/openstack/tempest/custom_tests/tempest_conf.yaml @@ -53,7 +53,6 @@ image-feature-enabled: network-feature-enabled: port_admin_state_change: true port_security: true - floating_ips: true placement: max_microversion: 1.31 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 a9aeef3db..66bd6e9f6 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 @@ -53,7 +53,6 @@ image-feature-enabled: network-feature-enabled: port_admin_state_change: true port_security: true - floating_ips: true placement: max_microversion: 1.31 validation: diff --git a/functest/opnfv_tests/openstack/tempest/tempest.py b/functest/opnfv_tests/openstack/tempest/tempest.py index c9b531282..a139284aa 100644 --- a/functest/opnfv_tests/openstack/tempest/tempest.py +++ b/functest/opnfv_tests/openstack/tempest/tempest.py @@ -514,6 +514,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') |