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:19 +0100 |
| commit | f4cd6397806e49a30eb15225741afb60d1a71769 (patch) | |
| tree | f40d651beccec3a37018d9b684c8253f374c5d66 /functest | |
| parent | 632f49a9f8c68b9f14178f0b8a7aaf17d8f7c2f2 (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)
Diffstat (limited to 'functest')
3 files changed, 1 insertions, 2 deletions
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 2b8a60fbd..758547359 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.30" 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 3fde88801..37aa2810b 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.30" validation: diff --git a/functest/opnfv_tests/openstack/tempest/tempest.py b/functest/opnfv_tests/openstack/tempest/tempest.py index a87e3afad..55ec8fa6e 100644 --- a/functest/opnfv_tests/openstack/tempest/tempest.py +++ b/functest/opnfv_tests/openstack/tempest/tempest.py @@ -515,6 +515,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') |