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)

diff --git a/docker/smoke-cntt/tempest_conf.yaml b/docker/smoke-cntt/tempest_conf.yaml
index c9d73f4..f11f91b 100644 (file)
--- 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 2440372..bcf736d 100644 (file)
--- 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 a9aeef3..66bd6e9 100644 (file)
--- 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 c9b5312..a139284 100644 (file)
--- 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')