tests: fix network interfaces names in conftest.py

Set network interfaces names according to the OS distribution in
conftest.py

Signed-off-by: Guillaume Abrioux <gabrioux@redhat.com>

diff --git a/tests/conftest.py b/tests/conftest.py
index 0ab95c9a68e87709e767a53a99df7e9418403be9..113d741b37c2a4fd715c4931edda6d47a52cc22b 100644 (file)
--- a/tests/conftest.py
+++ b/tests/conftest.py
@@ -19,6 +19,13 @@ def setup(host):
 
     ansible_distribution = ansible_facts["ansible_facts"]["ansible_distribution"]
 
+    if ansible_distribution == "CentOS":
+        public_interface = "eth1"
+        cluster_interface = "eth2"
+    else:
+        public_interface = "ens6"
+        cluster_interface = "ens7"
+
     subnet = ".".join(ansible_vars["public_network"].split(".")[0:-1])
     num_mons = len(ansible_vars["groups"]["mons"])
     if osd_auto_discovery:
@@ -30,13 +37,6 @@ def setup(host):
     osds_per_device = ansible_vars.get("osds_per_device", 1)
     num_osds = num_osds * osds_per_device
 
-    if ansible_distribution == "RedHat":
-        public_interface = "ens6"
-        cluster_interface = "ens7"
-    else:
-        public_interface = "eth1"
-        cluster_interface = "eth2"
-
     # If number of devices doesn't map to number of OSDs, allow tests to define
     # that custom number, defaulting it to ``num_devices``
     num_osds = ansible_vars.get('num_osds', num_osds)
@@ -71,6 +71,8 @@ def setup(host):
         address=address,
         osds=osds,
         conf_path=conf_path,
+        public_interface=public_interface,
+        cluster_interface=cluster_interface,
         cluster_address=cluster_address,
         container_binary=container_binary)
 

diff --git a/tests/functional/add-osds/container/group_vars/all b/tests/functional/add-osds/container/group_vars/all
index 7ba959affac632433189ef44f1909110fe77b18c..87a64289c7a6c708307b0e8f20d2ad58c4b2d857 100644 (file)
--- a/tests/functional/add-osds/container/group_vars/all
+++ b/tests/functional/add-osds/container/group_vars/all
@@ -6,8 +6,8 @@ containerized_deployment: true
 cluster: ceph
 public_network: "192.168.55.0/24"
 cluster_network: "192.168.56.0/24"
-monitor_interface: eth1
-radosgw_interface: eth1
+monitor_interface: "{{ 'eth1' if ansible_distribution == 'CentOS' else 'ens6' }}"
+radosgw_interface: "{{ 'eth1' if ansible_distribution == 'CentOS' else 'ens6' }}"
 journal_size: 100
 osd_objectstore: "bluestore"
 osd_scenario: lvm

diff --git a/tests/functional/add-osds/group_vars/all b/tests/functional/add-osds/group_vars/all
index 0ac99d0ca87e505bb1ef0ef804a6ac524136c385..99d4aeb33eedafdf255199dc5f644cae1bda3ee7 100644 (file)
--- a/tests/functional/add-osds/group_vars/all
+++ b/tests/functional/add-osds/group_vars/all
@@ -4,8 +4,8 @@ ceph_repository: community
 cluster: ceph
 public_network: "192.168.53.0/24"
 cluster_network: "192.168.54.0/24"
-monitor_interface: eth1
-radosgw_interface: eth1
+monitor_interface: "{{ 'eth1' if ansible_distribution == 'CentOS' else 'ens6' }}"
+radosgw_interface: "{{ 'eth1' if ansible_distribution == 'CentOS' else 'ens6' }}"
 journal_size: 100
 osd_objectstore: "bluestore"
 osd_scenario: lvm

diff --git a/tests/functional/all_daemons/container/group_vars/all b/tests/functional/all_daemons/container/group_vars/all
index f9582c12743060fdcb4f7fc0a73b3af1c171df40..7dc848948cd1e18e42fbc9b6e64b272c2dea708d 100644 (file)
--- a/tests/functional/all_daemons/container/group_vars/all
+++ b/tests/functional/all_daemons/container/group_vars/all
@@ -4,8 +4,8 @@
 docker: True
 
 containerized_deployment: True
-monitor_interface: eth1
-radosgw_interface: eth1
+monitor_interface: "{{ 'eth1' if ansible_distribution == 'CentOS' else 'ens6' }}"
+radosgw_interface: "{{ 'eth1' if ansible_distribution == 'CentOS' else 'ens6' }}"
 ceph_mon_docker_subnet: "{{ public_network }}"
 ceph_docker_on_openstack: False
 public_network: "192.168.17.0/24"

diff --git a/tests/functional/all_daemons/container/hosts b/tests/functional/all_daemons/container/hosts
index b1053d13c48757ef90b2852ff51e162cda6bc925..40c22385ba14b35a41b171cfca3a3f3548b3f363 100644 (file)
--- a/tests/functional/all_daemons/container/hosts
+++ b/tests/functional/all_daemons/container/hosts
@@ -1,6 +1,6 @@
 [mons]
 mon0 monitor_address=192.168.17.10
-mon1 monitor_interface=eth1
+mon1 monitor_interface="{{ 'eth1' if ansible_distribution == 'CentOS' else 'ens6' }}"
 mon2 monitor_address=192.168.17.12
 
 [osds]

diff --git a/tests/functional/all_daemons/container/hosts-ubuntu b/tests/functional/all_daemons/container/hosts-ubuntu
index 1ba2e98c2de92e46bb0adcd310084579d63312e1..a2cd66e59559b3f3980ce9377ec85779f4aa594c 100644 (file)
--- a/tests/functional/all_daemons/container/hosts-ubuntu
+++ b/tests/functional/all_daemons/container/hosts-ubuntu
@@ -1,6 +1,6 @@
 [mons]
 mon0 monitor_address=192.168.17.10
-mon1 monitor_interface=eth1
+mon1 monitor_interface="{{ 'eth1' if ansible_distribution == 'CentOS' else 'ens6' }}"
 mon2 monitor_address=192.168.17.12
 
 [osds]

diff --git a/tests/functional/all_daemons/group_vars/all b/tests/functional/all_daemons/group_vars/all
index 5e11a1ce77c3f6eb61a3b265b21d64d7a9126f48..046c86b33d9a51541ef301b56fd64bd75a795e36 100644 (file)
--- a/tests/functional/all_daemons/group_vars/all
+++ b/tests/functional/all_daemons/group_vars/all
@@ -3,7 +3,7 @@ ceph_origin: repository
 ceph_repository: community
 public_network: "192.168.1.0/24"
 cluster_network: "192.168.2.0/24"
-radosgw_interface: eth1
+radosgw_interface: "{{ 'eth1' if ansible_distribution == 'CentOS' else 'ens6' }}"
 ceph_conf_overrides:
   global:
     osd_pool_default_size: 1

diff --git a/tests/functional/all_daemons/hosts b/tests/functional/all_daemons/hosts
index 3f8cafbe8048ced764726371837747c96ec77cba..06564f9a315280fdbe6c516030e86fa14c85733e 100644 (file)
--- a/tests/functional/all_daemons/hosts
+++ b/tests/functional/all_daemons/hosts
@@ -1,6 +1,6 @@
 [mons]
 mon0 monitor_address=192.168.1.10
-mon1 monitor_interface=eth1
+mon1 monitor_interface="{{ 'eth1' if ansible_distribution == 'CentOS' else 'ens6' }}"
 mon2 monitor_address=192.168.1.12
 
 [osds]

diff --git a/tests/functional/all_daemons/hosts-switch-to-containers b/tests/functional/all_daemons/hosts-switch-to-containers
index d72da6b7b4ba0226a33759716b7ee6cad78be1ac..c95d9d2f19977a56da8393ff86cd04077d634b08 100644 (file)
--- a/tests/functional/all_daemons/hosts-switch-to-containers
+++ b/tests/functional/all_daemons/hosts-switch-to-containers
@@ -3,7 +3,7 @@ docker=True
 
 [mons]
 mon0 monitor_address=192.168.1.10
-mon1 monitor_interface=eth1
+mon1 monitor_interface="{{ 'eth1' if ansible_distribution == 'CentOS' else 'ens6' }}"
 mon2 monitor_address=192.168.1.12
 
 [osds]

diff --git a/tests/functional/all_daemons/hosts-ubuntu b/tests/functional/all_daemons/hosts-ubuntu
index 43f149c997dd74350fc5741f333ca7404c6281e3..dff4a61a56e5df393c560b6d26717dbd9e3b622b 100644 (file)
--- a/tests/functional/all_daemons/hosts-ubuntu
+++ b/tests/functional/all_daemons/hosts-ubuntu
@@ -1,6 +1,6 @@
 [mons]
 mon0 monitor_address=192.168.1.10
-mon1 monitor_interface=eth1
+mon1 monitor_interface=ens6
 mon2 monitor_address=192.168.1.12
 
 [osds]

diff --git a/tests/functional/bs-lvm-osds/container/group_vars/all b/tests/functional/bs-lvm-osds/container/group_vars/all
index 6f4e785ccba90ba0fafeb822dd35a6fc4644c1e2..8d41cbb17a6c0d013b1ffd3fac9c851f2161dbd6 100644 (file)
--- a/tests/functional/bs-lvm-osds/container/group_vars/all
+++ b/tests/functional/bs-lvm-osds/container/group_vars/all
@@ -9,7 +9,7 @@ ceph_repository: community
 containerized_deployment: True
 public_network: "192.168.39.0/24"
 cluster_network: "192.168.40.0/24"
-monitor_interface: eth1
+monitor_interface: "{{ 'eth1' if ansible_distribution == 'CentOS' else 'ens6' }}"
 osd_objectstore: "bluestore"
 osd_scenario: lvm
 copy_admin_key: true

diff --git a/tests/functional/bs-lvm-osds/group_vars/all b/tests/functional/bs-lvm-osds/group_vars/all
index 78e47df516e88ed257f0a0036d0ab0f125c1739d..eae5a497c06a75882d6a20d05ba08f66befe25bf 100644 (file)
--- a/tests/functional/bs-lvm-osds/group_vars/all
+++ b/tests/functional/bs-lvm-osds/group_vars/all
@@ -4,7 +4,7 @@ ceph_origin: repository
 ceph_repository: community
 public_network: "192.168.39.0/24"
 cluster_network: "192.168.40.0/24"
-monitor_interface: eth1
+monitor_interface: "{{ 'eth1' if ansible_distribution == 'CentOS' else 'ens6' }}"
 osd_objectstore: "bluestore"
 osd_scenario: lvm
 copy_admin_key: true

diff --git a/tests/functional/collocation/container/group_vars/all b/tests/functional/collocation/container/group_vars/all
index fe3e7ab3efd0ce4ef9e53adad1e1192fd9abd567..8ea5ee4d2fe386c9636569f008cd67cebf129cea 100644 (file)
--- a/tests/functional/collocation/container/group_vars/all
+++ b/tests/functional/collocation/container/group_vars/all
@@ -4,8 +4,8 @@
 docker: True
 
 containerized_deployment: True
-monitor_interface: eth1
-radosgw_interface: eth1
+monitor_interface: "{{ 'eth1' if ansible_distribution == 'CentOS' else 'ens6' }}"
+radosgw_interface: "{{ 'eth1' if ansible_distribution == 'CentOS' else 'ens6' }}"
 radosgw_num_instances: 2
 ceph_mon_docker_subnet: "{{ public_network }}"
 ceph_docker_on_openstack: False

diff --git a/tests/functional/collocation/group_vars/all b/tests/functional/collocation/group_vars/all
index 48cb5d74ad05e577a98acc4f49c92e9301943584..0df7c7a6e8436f2d523a069a7233767b4397fc5a 100644 (file)
--- a/tests/functional/collocation/group_vars/all
+++ b/tests/functional/collocation/group_vars/all
@@ -1,7 +1,7 @@
 ---
 containerized_deployment: False
-monitor_interface: eth1
-radosgw_interface: eth1
+monitor_interface: "{{ 'eth1' if ansible_distribution == 'CentOS' else 'ens6' }}"
+radosgw_interface: "{{ 'eth1' if ansible_distribution == 'CentOS' else 'ens6' }}"
 ceph_mon_docker_subnet: "{{ public_network }}"
 ceph_docker_on_openstack: False
 public_network: "192.168.15.0/24"

diff --git a/tests/functional/lvm-auto-discovery/container/group_vars/all b/tests/functional/lvm-auto-discovery/container/group_vars/all
index 4d2b960cc779665d92ef87f12a61a5e8a49038c3..f537a13a199e7c6620db0cb7ca9e8f0313efa473 100644 (file)
--- a/tests/functional/lvm-auto-discovery/container/group_vars/all
+++ b/tests/functional/lvm-auto-discovery/container/group_vars/all
@@ -10,8 +10,8 @@ ceph_repository: dev
 cluster: ceph
 public_network: "192.168.39.0/24"
 cluster_network: "192.168.40.0/24"
-monitor_interface: eth1
-radosgw_interface: eth1
+monitor_interface: "{{ 'eth1' if ansible_distribution == 'CentOS' else 'ens6' }}"
+radosgw_interface: "{{ 'eth1' if ansible_distribution == 'CentOS' else 'ens6' }}"
 journal_size: 100
 osd_objectstore: "bluestore"
 crush_device_class: test

diff --git a/tests/functional/lvm-auto-discovery/group_vars/all b/tests/functional/lvm-auto-discovery/group_vars/all
index 278ca40b9542025530b3d36d94130f79ef127de9..f2d1c14172b29bae2142f5f9bb075d1747a6a8c7 100644 (file)
--- a/tests/functional/lvm-auto-discovery/group_vars/all
+++ b/tests/functional/lvm-auto-discovery/group_vars/all
@@ -5,8 +5,8 @@ ceph_repository: community
 cluster: ceph
 public_network: "192.168.39.0/24"
 cluster_network: "192.168.40.0/24"
-monitor_interface: eth1
-radosgw_interface: eth1
+monitor_interface: "{{ 'eth1' if ansible_distribution == 'CentOS' else 'ens6' }}"
+radosgw_interface: "{{ 'eth1' if ansible_distribution == 'CentOS' else 'ens6' }}"
 osd_objectstore: "bluestore"
 crush_device_class: test
 osd_scenario: lvm

diff --git a/tests/functional/lvm-batch/container/group_vars/all b/tests/functional/lvm-batch/container/group_vars/all
index 6ed0becf0c5f70f4984ea97a20cc505daa64f8be..ddf9306d3686b7de1bb9f08e586972e5b6a47fc6 100644 (file)
--- a/tests/functional/lvm-batch/container/group_vars/all
+++ b/tests/functional/lvm-batch/container/group_vars/all
@@ -10,8 +10,8 @@ ceph_repository: community
 cluster: ceph
 public_network: "192.168.39.0/24"
 cluster_network: "192.168.40.0/24"
-monitor_interface: eth1
-radosgw_interface: eth1
+monitor_interface: "{{ 'eth1' if ansible_distribution == 'CentOS' else 'ens6' }}"
+radosgw_interface: "{{ 'eth1' if ansible_distribution == 'CentOS' else 'ens6' }}"
 journal_size: 100
 osd_objectstore: "bluestore"
 crush_device_class: test

diff --git a/tests/functional/lvm-batch/group_vars/all b/tests/functional/lvm-batch/group_vars/all
index 2e5daca3af5d84ee99de2737a6d44147b555d8a6..b3126b13c992a87a1cd2ecc3a3d0d59f3de805c6 100644 (file)
--- a/tests/functional/lvm-batch/group_vars/all
+++ b/tests/functional/lvm-batch/group_vars/all
@@ -5,8 +5,8 @@ ceph_repository: community
 cluster: ceph
 public_network: "192.168.39.0/24"
 cluster_network: "192.168.40.0/24"
-monitor_interface: eth1
-radosgw_interface: eth1
+monitor_interface: "{{ 'eth1' if ansible_distribution == 'CentOS' else 'ens6' }}"
+radosgw_interface: "{{ 'eth1' if ansible_distribution == 'CentOS' else 'ens6' }}"
 osd_objectstore: "bluestore"
 crush_device_class: test
 osd_scenario: lvm

diff --git a/tests/functional/lvm-osds/container/group_vars/all b/tests/functional/lvm-osds/container/group_vars/all
index 45e2df8930356e7ef00b5384d63fe68a19d84d21..f080d7db0d38ce332f077816ff07b31c94cf0112 100644 (file)
--- a/tests/functional/lvm-osds/container/group_vars/all
+++ b/tests/functional/lvm-osds/container/group_vars/all
@@ -8,8 +8,8 @@ ceph_origin: repository
 ceph_repository: community
 public_network: "192.168.39.0/24"
 cluster_network: "192.168.40.0/24"
-monitor_interface: eth1
-radosgw_interface: eth1
+monitor_interface: "{{ 'eth1' if ansible_distribution == 'CentOS' else 'ens6' }}"
+radosgw_interface: "{{ 'eth1' if ansible_distribution == 'CentOS' else 'ens6' }}"
 journal_size: 100
 osd_objectstore: "filestore"
 copy_admin_key: true

diff --git a/tests/functional/lvm-osds/group_vars/all b/tests/functional/lvm-osds/group_vars/all
index 2857469b99b149135036b04d6cd8f622fe472351..c23c858b07eccedb67b0a7d437e623e470fb29bf 100644 (file)
--- a/tests/functional/lvm-osds/group_vars/all
+++ b/tests/functional/lvm-osds/group_vars/all
@@ -4,8 +4,8 @@ ceph_origin: repository
 ceph_repository: community
 public_network: "192.168.39.0/24"
 cluster_network: "192.168.40.0/24"
-monitor_interface: eth1
-radosgw_interface: eth1
+monitor_interface: "{{ 'eth1' if ansible_distribution == 'CentOS' else 'ens6' }}"
+radosgw_interface: "{{ 'eth1' if ansible_distribution == 'CentOS' else 'ens6' }}"
 journal_size: 100
 osd_objectstore: "filestore"
 copy_admin_key: true

diff --git a/tests/functional/podman/group_vars/all b/tests/functional/podman/group_vars/all
index 2d4b6f92246bfc7f0069fdb2afa2f1d387bacba1..58a849c8f6d706016d5e4cc2d0ee4347c1eca59a 100644 (file)
--- a/tests/functional/podman/group_vars/all
+++ b/tests/functional/podman/group_vars/all
@@ -4,8 +4,8 @@
 docker: True
 
 containerized_deployment: True
-monitor_interface: "{{ 'ens6' if ansible_distribution == 'RedHat' else 'eth1' }}"
-radosgw_interface: "{{ 'ens6' if ansible_distribution == 'RedHat' else 'eth1' }}"
+monitor_interface: "{{ 'eth1' if ansible_distribution == 'CentOS' else 'ens6' }}"
+radosgw_interface: "{{ 'ens1' if ansible_distribution == 'CentOS' else 'ens6' }}"
 ceph_mon_docker_subnet: "{{ public_network }}"
 ceph_docker_on_openstack: False
 public_network: "192.168.30.0/24"

diff --git a/tests/functional/rgw-multisite/container/group_vars/all b/tests/functional/rgw-multisite/container/group_vars/all
index 1949c21643c9621cc6f1d77ed2b474e067ba20ef..59346718a67cda5b719966af9bfc0511ecc0d36f 100644 (file)
--- a/tests/functional/rgw-multisite/container/group_vars/all
+++ b/tests/functional/rgw-multisite/container/group_vars/all
@@ -6,8 +6,8 @@ ceph_repository: community
 cluster: ceph
 public_network: "192.168.105.0/24"
 cluster_network: "192.168.106.0/24"
-monitor_interface: eth1
-radosgw_interface: eth1
+monitor_interface: "{{ 'eth1' if ansible_distribution == 'CentOS' else 'ens6' }}"
+radosgw_interface: "{{ 'eth1' if ansible_distribution == 'CentOS' else 'ens6' }}"
 journal_size: 100
 osd_objectstore: "bluestore"
 osd_scenario: lvm

diff --git a/tests/functional/rgw-multisite/container/secondary/group_vars/all b/tests/functional/rgw-multisite/container/secondary/group_vars/all
index bb51d7930f76a81e9e35dc369e6b9ffbc39f5f57..af43d618f50f11bca98b338e0f8c4a2df7bf1c47 100644 (file)
--- a/tests/functional/rgw-multisite/container/secondary/group_vars/all
+++ b/tests/functional/rgw-multisite/container/secondary/group_vars/all
@@ -6,8 +6,8 @@ ceph_repository: community
 cluster: ceph
 public_network: "192.168.107.0/24"
 cluster_network: "192.168.108.0/24"
-monitor_interface: eth1
-radosgw_interface: eth1
+monitor_interface: "{{ 'eth1' if ansible_distribution == 'CentOS' else 'ens6' }}"
+radosgw_interface: "{{ 'eth1' if ansible_distribution == 'CentOS' else 'ens6' }}"
 journal_size: 100
 osd_objectstore: "bluestore"
 osd_scenario: lvm

diff --git a/tests/functional/rgw-multisite/group_vars/all b/tests/functional/rgw-multisite/group_vars/all
index 3a9a13eb5b7be90fa03841f571c0e9c00a2c0e80..ab53a5f407c1a657b53d97d13b3da4970ade4658 100644 (file)
--- a/tests/functional/rgw-multisite/group_vars/all
+++ b/tests/functional/rgw-multisite/group_vars/all
@@ -4,8 +4,8 @@ ceph_repository: community
 cluster: ceph
 public_network: "192.168.101.0/24"
 cluster_network: "192.168.102.0/24"
-monitor_interface: eth1
-radosgw_interface: eth1
+monitor_interface: "{{ 'eth1' if ansible_distribution == 'CentOS' else 'ens6' }}"
+radosgw_interface: "{{ 'eth1' if ansible_distribution == 'CentOS' else 'ens6' }}"
 journal_size: 100
 osd_objectstore: "bluestore"
 osd_scenario: lvm

diff --git a/tests/functional/rgw-multisite/secondary/group_vars/all b/tests/functional/rgw-multisite/secondary/group_vars/all
index 2b605f43eca482d120263676648be3197dc53bce..70ba003d909b3d5e5effbb60e597141501c898ff 100644 (file)
--- a/tests/functional/rgw-multisite/secondary/group_vars/all
+++ b/tests/functional/rgw-multisite/secondary/group_vars/all
@@ -4,8 +4,8 @@ ceph_repository: community
 cluster: ceph
 public_network: "192.168.103.0/24"
 cluster_network: "192.168.104.0/24"
-monitor_interface: eth1
-radosgw_interface: eth1
+monitor_interface: "{{ 'eth1' if ansible_distribution == 'CentOS' else 'ens6' }}"
+radosgw_interface: "{{ 'eth1' if ansible_distribution == 'CentOS' else 'ens6' }}"
 journal_size: 100
 osd_objectstore: "bluestore"
 osd_scenario: lvm

diff --git a/tests/functional/shrink_mon/container/group_vars/all b/tests/functional/shrink_mon/container/group_vars/all
index f0bdd3aed615b3a2978715d3f199e1c5c527465b..bdb856c911f6f443aeeb1e766930f5067ccffc53 100644 (file)
--- a/tests/functional/shrink_mon/container/group_vars/all
+++ b/tests/functional/shrink_mon/container/group_vars/all
@@ -4,7 +4,7 @@
 docker: True
 
 containerized_deployment: True
-monitor_interface: eth1
+monitor_interface: "{{ 'eth1' if ansible_distribution == 'CentOS' else 'ens6' }}"
 ceph_mon_docker_subnet: "{{ public_network }}"
 ceph_docker_on_openstack: False
 public_network: "192.168.17.0/24"

diff --git a/tests/functional/shrink_mon/hosts b/tests/functional/shrink_mon/hosts
index b2631e0834f7b28c73e2e4f419a0d57b4a5d6243..541558a7a7364db09bc0bf5d615f586cdf1c2594 100644 (file)
--- a/tests/functional/shrink_mon/hosts
+++ b/tests/functional/shrink_mon/hosts
@@ -1,6 +1,6 @@
 [mons]
 mon0 monitor_address=192.168.1.10
-mon1 monitor_interface=eth1
+mon1 monitor_interface="{{ 'eth1' if ansible_distribution == 'CentOS' else 'ens6' }}"
 mon2 monitor_address=192.168.1.12
 
 [osds]

diff --git a/tests/functional/shrink_mon/hosts-switch-to-containers b/tests/functional/shrink_mon/hosts-switch-to-containers
index d72da6b7b4ba0226a33759716b7ee6cad78be1ac..c95d9d2f19977a56da8393ff86cd04077d634b08 100644 (file)
--- a/tests/functional/shrink_mon/hosts-switch-to-containers
+++ b/tests/functional/shrink_mon/hosts-switch-to-containers
@@ -3,7 +3,7 @@ docker=True
 
 [mons]
 mon0 monitor_address=192.168.1.10
-mon1 monitor_interface=eth1
+mon1 monitor_interface="{{ 'eth1' if ansible_distribution == 'CentOS' else 'ens6' }}"
 mon2 monitor_address=192.168.1.12
 
 [osds]

diff --git a/tests/functional/shrink_mon/hosts-ubuntu b/tests/functional/shrink_mon/hosts-ubuntu
index 7e562adb7d916a550077b4f6ee951f131b41195d..6675222ed9c76f1ce3ccb281901f46fd6d9a0b6b 100644 (file)
--- a/tests/functional/shrink_mon/hosts-ubuntu
+++ b/tests/functional/shrink_mon/hosts-ubuntu
@@ -1,6 +1,6 @@
 [mons]
 mon0 monitor_address=192.168.1.10
-mon1 monitor_interface=eth1
+mon1 monitor_interface="{{ 'eth1' if ansible_distribution == 'CentOS' else 'ens6' }}"
 mon2 monitor_address=192.168.1.12
 
 [osds]

diff --git a/tests/functional/shrink_osd/container/group_vars/all b/tests/functional/shrink_osd/container/group_vars/all
index a4806c26fd9532268be6a1f2ae248553a5f90ce2..e17f8f7bc78aae1fa3ff967d261b42225bb1926e 100644 (file)
--- a/tests/functional/shrink_osd/container/group_vars/all
+++ b/tests/functional/shrink_osd/container/group_vars/all
@@ -4,7 +4,7 @@
 docker: True
 
 containerized_deployment: True
-monitor_interface: eth1
+monitor_interface: "{{ 'eth1' if ansible_distribution == 'CentOS' else 'ens6' }}"
 ceph_mon_docker_subnet: "{{ public_network }}"
 ceph_docker_on_openstack: False
 public_network: "192.168.73.0/24"

diff --git a/tests/functional/tests/rgw/test_rgw.py b/tests/functional/tests/rgw/test_rgw.py
index 05084a1e1a0a6358406885ef30a0dc88befdbf42..baac29bf5da93f679d4d6dcf39fdcd07ccc44de2 100644 (file)
--- a/tests/functional/tests/rgw/test_rgw.py
+++ b/tests/functional/tests/rgw/test_rgw.py
@@ -52,9 +52,9 @@ class TestRGWs(object):
             assert instance_name in daemons
 
     @pytest.mark.no_docker
-    def test_rgw_http_endpoint(self, node, host):
-        # rgw frontends ip_addr is configured on eth1
-        ip_addr = host.interface("eth1").addresses[0]
+    def test_rgw_http_endpoint(self, node, host, setup):
+        # rgw frontends ip_addr is configured on public_interface
+        ip_addr = host.interface(setup['public_interface']).addresses[0]
         for i in range(int(node["radosgw_num_instances"])):
             assert host.socket(
                 "tcp://{ip_addr}:{port}".format(ip_addr=ip_addr,