Revert "tests: add ubuntu bionic support"

This reverts commit 33c09af2507101289e8524c91f2b48c5adbdf904.

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

diff --git a/docs/source/index.rst b/docs/source/index.rst
index f40856bd96a099b7dc0a44657122c90ad6578cbe..465f621b72c46b596ced27a657b1cb8ad114d9ed 100644 (file)
--- a/docs/source/index.rst
+++ b/docs/source/index.rst
@@ -210,7 +210,7 @@ An example configuration that deploys the upstream ``jewel`` version of Ceph wit
    ceph_stable_release: jewel
    public_network: "192.168.3.0/24"
    cluster_network: "192.168.4.0/24"
-   monitor_interface: ens6
+   monitor_interface: eth1
    devices:
      - '/dev/sda'
      - '/dev/sdb'

diff --git a/docs/source/testing/tests.rst b/docs/source/testing/tests.rst
index a86a3fb6755d2a48b6ece51a748db37bd3324d88..46cdce0d2933eb22a3cb69aa9284ddfae01fe190 100644 (file)
--- a/docs/source/testing/tests.rst
+++ b/docs/source/testing/tests.rst
@@ -65,7 +65,7 @@ many fixtures as needed) like ``File``:
 The ``node`` fixture contains a few useful pieces of information about the node
 where the test is being executed, this is captured once, before tests run:
 
-* ``address``: The IP for the ``ens6`` interface
+* ``address``: The IP for the ``eth1`` interface
 * ``subnet``: The subnet that ``address`` belongs to
 * ``vars``: all the Ansible vars set for the current run
 * ``osd_ids``: a list of all the OSD IDs

diff --git a/tests/conftest.py b/tests/conftest.py
index 51c9f4a9696b085db681951b38ddb38ba8a84502..0ab95c9a68e87709e767a53a99df7e9418403be9 100644 (file)
--- a/tests/conftest.py
+++ b/tests/conftest.py
@@ -8,8 +8,6 @@ def setup(host):
     container_binary = ""
     osd_ids = []
     osds = []
-    public_interface = "ens6"
-    cluster_interface = "ens7"
 
     ansible_vars = host.ansible.get_variables()
     ansible_facts = host.ansible("setup")
@@ -19,6 +17,8 @@ def setup(host):
     group_names = ansible_vars["group_names"]
     fsid = ansible_vars.get("fsid")
 
+    ansible_distribution = ansible_facts["ansible_facts"]["ansible_distribution"]
+
     subnet = ".".join(ansible_vars["public_network"].split(".")[0:-1])
     num_mons = len(ansible_vars["groups"]["mons"])
     if osd_auto_discovery:
@@ -30,6 +30,13 @@ 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)

diff --git a/tests/functional/add-osds/container/group_vars/all b/tests/functional/add-osds/container/group_vars/all
index 5e3b403195c02b96c5bab8233b6c8556dd15541c..7ba959affac632433189ef44f1909110fe77b18c 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: ens6
-radosgw_interface: ens6
+monitor_interface: eth1
+radosgw_interface: eth1
 journal_size: 100
 osd_objectstore: "bluestore"
 osd_scenario: lvm

diff --git a/tests/functional/add-osds/container/vagrant_variables.yml b/tests/functional/add-osds/container/vagrant_variables.yml
index cafd1ceeb558e1c934beca6f44f13bb095e02cc1..c0bf4174f5bf1f59d19bc0d0a13355136e0b189a 100644 (file)
--- a/tests/functional/add-osds/container/vagrant_variables.yml
+++ b/tests/functional/add-osds/container/vagrant_variables.yml
@@ -27,8 +27,8 @@ cluster_subnet: 192.168.56
 memory: 1024
 
 # Ethernet interface name
-# use ens6 for libvirt and ubuntu precise, enp0s8 for CentOS and ubuntu xenial
-eth: 'ens6'
+# use eth1 for libvirt and ubuntu precise, enp0s8 for CentOS and ubuntu xenial
+eth: 'eth1'
 
 # Disks
 # For libvirt use disks: "[ '/dev/vdb', '/dev/vdc' ]"

diff --git a/tests/functional/add-osds/group_vars/all b/tests/functional/add-osds/group_vars/all
index ae4a6538791abd2193cc23e3de0adeac94b3ca2c..0ac99d0ca87e505bb1ef0ef804a6ac524136c385 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: ens6
-radosgw_interface: ens6
+monitor_interface: eth1
+radosgw_interface: eth1
 journal_size: 100
 osd_objectstore: "bluestore"
 osd_scenario: lvm

diff --git a/tests/functional/add-osds/vagrant_variables.yml b/tests/functional/add-osds/vagrant_variables.yml
index d7ce86d8a0de8d9cebeb4f701e244a767af0f2ff..167b60cc2fe149fdda341ba61a985a97d1b9b195 100644 (file)
--- a/tests/functional/add-osds/vagrant_variables.yml
+++ b/tests/functional/add-osds/vagrant_variables.yml
@@ -27,8 +27,8 @@ cluster_subnet: 192.168.54
 memory: 1024
 
 # Ethernet interface name
-# use ens6 for libvirt and ubuntu precise, enp0s8 for CentOS and ubuntu xenial
-eth: 'ens6'
+# use eth1 for libvirt and ubuntu precise, enp0s8 for CentOS and ubuntu xenial
+eth: 'eth1'
 
 # Disks
 # For libvirt use disks: "[ '/dev/vdb', '/dev/vdc' ]"

diff --git a/tests/functional/all_daemons/container/group_vars/all b/tests/functional/all_daemons/container/group_vars/all
index d5981820dc5f4d5d9f316f4813ecacff03509676..f9582c12743060fdcb4f7fc0a73b3af1c171df40 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: ens6
-radosgw_interface: ens6
+monitor_interface: eth1
+radosgw_interface: eth1
 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 10431ea950155275b7d7c7675e4d72cdd9fe4683..b1053d13c48757ef90b2852ff51e162cda6bc925 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=ens6
+mon1 monitor_interface=eth1
 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 6a7838bc49c1ca7e08a8c7e0a77090519688db48..1ba2e98c2de92e46bb0adcd310084579d63312e1 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=ens6
+mon1 monitor_interface=eth1
 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 10e4451b19fd83f78b634972be20a1a678c5dd9c..5e11a1ce77c3f6eb61a3b265b21d64d7a9126f48 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: ens6
+radosgw_interface: eth1
 ceph_conf_overrides:
   global:
     osd_pool_default_size: 1

diff --git a/tests/functional/all_daemons/hosts b/tests/functional/all_daemons/hosts
index 590c96ed419c899f9a51e1ee951cd636faed5179..3f8cafbe8048ced764726371837747c96ec77cba 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=ens6
+mon1 monitor_interface=eth1
 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 29db602b35e5ec3a263a9defc826938f67f8625b..d72da6b7b4ba0226a33759716b7ee6cad78be1ac 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=ens6
+mon1 monitor_interface=eth1
 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 dff4a61a56e5df393c560b6d26717dbd9e3b622b..43f149c997dd74350fc5741f333ca7404c6281e3 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=ens6
+mon1 monitor_interface=eth1
 mon2 monitor_address=192.168.1.12
 
 [osds]

diff --git a/tests/functional/all_daemons/vagrant_variables.yml b/tests/functional/all_daemons/vagrant_variables.yml
index 0a597c9b913941b5984d102de92abb0d5a8072c2..c1301ed307eff76ed442b20fa84fa93a13002b75 100644 (file)
--- a/tests/functional/all_daemons/vagrant_variables.yml
+++ b/tests/functional/all_daemons/vagrant_variables.yml
@@ -27,8 +27,8 @@ cluster_subnet: 192.168.2
 memory: 1024
 
 # Ethernet interface name
-# use ens6 for libvirt and ubuntu precise, enp0s8 for CentOS and ubuntu xenial
-eth: 'ens6'
+# use eth1 for libvirt and ubuntu precise, enp0s8 for CentOS and ubuntu xenial
+eth: 'eth1'
 
 # Disks
 # For libvirt use disks: "[ '/dev/vdb', '/dev/vdc' ]"

diff --git a/tests/functional/bs-lvm-osds/container/group_vars/all b/tests/functional/bs-lvm-osds/container/group_vars/all
index 2a7c803ce1e2e3d45809a2b111d4cca6027bd381..6f4e785ccba90ba0fafeb822dd35a6fc4644c1e2 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: ens6
+monitor_interface: eth1
 osd_objectstore: "bluestore"
 osd_scenario: lvm
 copy_admin_key: true

diff --git a/tests/functional/bs-lvm-osds/container/vagrant_variables.yml b/tests/functional/bs-lvm-osds/container/vagrant_variables.yml
index 145b8cbe4f8624ebd16f6eb7e910c79f332c3681..6bf2bcd2020681af81fa12da7132572f47f01b45 100644 (file)
--- a/tests/functional/bs-lvm-osds/container/vagrant_variables.yml
+++ b/tests/functional/bs-lvm-osds/container/vagrant_variables.yml
@@ -30,8 +30,8 @@ cluster_subnet: 192.168.40
 memory: 1024
 
 # Ethernet interface name
-# use ens6 for libvirt and ubuntu precise, enp0s8 for CentOS and ubuntu xenial
-eth: 'ens6'
+# use eth1 for libvirt and ubuntu precise, enp0s8 for CentOS and ubuntu xenial
+eth: 'eth1'
 
 # Disks
 # For libvirt use disks: "[ '/dev/vdb', '/dev/vdc' ]"

diff --git a/tests/functional/bs-lvm-osds/group_vars/all b/tests/functional/bs-lvm-osds/group_vars/all
index dcd60ff245be6d5352cf511fdae4a7a74e8da9b5..78e47df516e88ed257f0a0036d0ab0f125c1739d 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: ens6
+monitor_interface: eth1
 osd_objectstore: "bluestore"
 osd_scenario: lvm
 copy_admin_key: true

diff --git a/tests/functional/bs-lvm-osds/vagrant_variables.yml b/tests/functional/bs-lvm-osds/vagrant_variables.yml
index c9274508e3cdfb41883d9586f60e9b67bca9aef1..6636233ccdc01b4c4a892911772369a92eaf3975 100644 (file)
--- a/tests/functional/bs-lvm-osds/vagrant_variables.yml
+++ b/tests/functional/bs-lvm-osds/vagrant_variables.yml
@@ -27,8 +27,8 @@ cluster_subnet: 192.168.40
 memory: 1024
 
 # Ethernet interface name
-# use ens6 for libvirt and ubuntu precise, enp0s8 for CentOS and ubuntu xenial
-eth: 'ens6'
+# use eth1 for libvirt and ubuntu precise, enp0s8 for CentOS and ubuntu xenial
+eth: 'eth1'
 
 # Disks
 # For libvirt use disks: "[ '/dev/vdb', '/dev/vdc' ]"

diff --git a/tests/functional/collocation/container/group_vars/all b/tests/functional/collocation/container/group_vars/all
index 8bae91af69b343133f3746337016065defbdb1ad..fe3e7ab3efd0ce4ef9e53adad1e1192fd9abd567 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: ens6
-radosgw_interface: ens6
+monitor_interface: eth1
+radosgw_interface: eth1
 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 2a9389f8d7b2c9a4eef2aa71284584870f74d487..48cb5d74ad05e577a98acc4f49c92e9301943584 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: ens6
-radosgw_interface: ens6
+monitor_interface: eth1
+radosgw_interface: eth1
 ceph_mon_docker_subnet: "{{ public_network }}"
 ceph_docker_on_openstack: False
 public_network: "192.168.15.0/24"

diff --git a/tests/functional/infra_lv_create/vagrant_variables.yml b/tests/functional/infra_lv_create/vagrant_variables.yml
index 109caf5c6c664b70412e3334e436f4cb3698f2b6..59714099d706eadce4532f251ac4ea61b629d52c 100644 (file)
--- a/tests/functional/infra_lv_create/vagrant_variables.yml
+++ b/tests/functional/infra_lv_create/vagrant_variables.yml
@@ -27,8 +27,8 @@ cluster_subnet: 192.168.40
 memory: 1024
 
 # Ethernet interface name
-# use ens6 for libvirt and ubuntu precise, enp0s8 for CentOS and ubuntu xenial
-eth: 'ens6'
+# use eth1 for libvirt and ubuntu precise, enp0s8 for CentOS and ubuntu xenial
+eth: 'eth1'
 
 # Disks
 # For libvirt use disks: "[ '/dev/vdb', '/dev/vdc' ]"

diff --git a/tests/functional/lvm-auto-discovery/container/group_vars/all b/tests/functional/lvm-auto-discovery/container/group_vars/all
index b28750ed3a61c6d381271fdb0160e05006e009db..4d2b960cc779665d92ef87f12a61a5e8a49038c3 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: ens6
-radosgw_interface: ens6
+monitor_interface: eth1
+radosgw_interface: eth1
 journal_size: 100
 osd_objectstore: "bluestore"
 crush_device_class: test

diff --git a/tests/functional/lvm-auto-discovery/container/vagrant_variables.yml b/tests/functional/lvm-auto-discovery/container/vagrant_variables.yml
index 513ddf7facc5d0ef7465cd0c453fcc4b7f78cc5a..77e357824e21c8699151d157ca47d5f5455d49aa 100644 (file)
--- a/tests/functional/lvm-auto-discovery/container/vagrant_variables.yml
+++ b/tests/functional/lvm-auto-discovery/container/vagrant_variables.yml
@@ -30,8 +30,8 @@ cluster_subnet: 192.168.40
 memory: 2048
 
 # Ethernet interface name
-# use ens6 for libvirt and ubuntu precise, enp0s8 for CentOS and ubuntu xenial
-eth: 'ens6'
+# use eth1 for libvirt and ubuntu precise, enp0s8 for CentOS and ubuntu xenial
+eth: 'eth1'
 
 # Disks
 # For libvirt use disks: "[ '/dev/vdb', '/dev/vdc' ]"

diff --git a/tests/functional/lvm-auto-discovery/group_vars/all b/tests/functional/lvm-auto-discovery/group_vars/all
index af72416b51a84169b6227f1acad4257910d6c21b..278ca40b9542025530b3d36d94130f79ef127de9 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: ens6
-radosgw_interface: ens6
+monitor_interface: eth1
+radosgw_interface: eth1
 osd_objectstore: "bluestore"
 crush_device_class: test
 osd_scenario: lvm

diff --git a/tests/functional/lvm-auto-discovery/vagrant_variables.yml b/tests/functional/lvm-auto-discovery/vagrant_variables.yml
index c9274508e3cdfb41883d9586f60e9b67bca9aef1..6636233ccdc01b4c4a892911772369a92eaf3975 100644 (file)
--- a/tests/functional/lvm-auto-discovery/vagrant_variables.yml
+++ b/tests/functional/lvm-auto-discovery/vagrant_variables.yml
@@ -27,8 +27,8 @@ cluster_subnet: 192.168.40
 memory: 1024
 
 # Ethernet interface name
-# use ens6 for libvirt and ubuntu precise, enp0s8 for CentOS and ubuntu xenial
-eth: 'ens6'
+# use eth1 for libvirt and ubuntu precise, enp0s8 for CentOS and ubuntu xenial
+eth: 'eth1'
 
 # Disks
 # For libvirt use disks: "[ '/dev/vdb', '/dev/vdc' ]"

diff --git a/tests/functional/lvm-batch/container/group_vars/all b/tests/functional/lvm-batch/container/group_vars/all
index 18e42c8788b11853a82997f08b6420b23e8b7966..6ed0becf0c5f70f4984ea97a20cc505daa64f8be 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: ens6
-radosgw_interface: ens6
+monitor_interface: eth1
+radosgw_interface: eth1
 journal_size: 100
 osd_objectstore: "bluestore"
 crush_device_class: test

diff --git a/tests/functional/lvm-batch/container/vagrant_variables.yml b/tests/functional/lvm-batch/container/vagrant_variables.yml
index 145b8cbe4f8624ebd16f6eb7e910c79f332c3681..6bf2bcd2020681af81fa12da7132572f47f01b45 100644 (file)
--- a/tests/functional/lvm-batch/container/vagrant_variables.yml
+++ b/tests/functional/lvm-batch/container/vagrant_variables.yml
@@ -30,8 +30,8 @@ cluster_subnet: 192.168.40
 memory: 1024
 
 # Ethernet interface name
-# use ens6 for libvirt and ubuntu precise, enp0s8 for CentOS and ubuntu xenial
-eth: 'ens6'
+# use eth1 for libvirt and ubuntu precise, enp0s8 for CentOS and ubuntu xenial
+eth: 'eth1'
 
 # Disks
 # For libvirt use disks: "[ '/dev/vdb', '/dev/vdc' ]"

diff --git a/tests/functional/lvm-batch/group_vars/all b/tests/functional/lvm-batch/group_vars/all
index 4e76d474f282e86b9b63eaf02f8e001cf25e81e6..2e5daca3af5d84ee99de2737a6d44147b555d8a6 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: ens6
-radosgw_interface: ens6
+monitor_interface: eth1
+radosgw_interface: eth1
 osd_objectstore: "bluestore"
 crush_device_class: test
 osd_scenario: lvm

diff --git a/tests/functional/lvm-batch/vagrant_variables.yml b/tests/functional/lvm-batch/vagrant_variables.yml
index c9274508e3cdfb41883d9586f60e9b67bca9aef1..6636233ccdc01b4c4a892911772369a92eaf3975 100644 (file)
--- a/tests/functional/lvm-batch/vagrant_variables.yml
+++ b/tests/functional/lvm-batch/vagrant_variables.yml
@@ -27,8 +27,8 @@ cluster_subnet: 192.168.40
 memory: 1024
 
 # Ethernet interface name
-# use ens6 for libvirt and ubuntu precise, enp0s8 for CentOS and ubuntu xenial
-eth: 'ens6'
+# use eth1 for libvirt and ubuntu precise, enp0s8 for CentOS and ubuntu xenial
+eth: 'eth1'
 
 # Disks
 # For libvirt use disks: "[ '/dev/vdb', '/dev/vdc' ]"

diff --git a/tests/functional/lvm-osds/container/group_vars/all b/tests/functional/lvm-osds/container/group_vars/all
index a722bf354ca06f023bd4e7e2e10a4c4191c7b5c0..45e2df8930356e7ef00b5384d63fe68a19d84d21 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: ens6
-radosgw_interface: ens6
+monitor_interface: eth1
+radosgw_interface: eth1
 journal_size: 100
 osd_objectstore: "filestore"
 copy_admin_key: true

diff --git a/tests/functional/lvm-osds/container/vagrant_variables.yml b/tests/functional/lvm-osds/container/vagrant_variables.yml
index 145b8cbe4f8624ebd16f6eb7e910c79f332c3681..6bf2bcd2020681af81fa12da7132572f47f01b45 100644 (file)
--- a/tests/functional/lvm-osds/container/vagrant_variables.yml
+++ b/tests/functional/lvm-osds/container/vagrant_variables.yml
@@ -30,8 +30,8 @@ cluster_subnet: 192.168.40
 memory: 1024
 
 # Ethernet interface name
-# use ens6 for libvirt and ubuntu precise, enp0s8 for CentOS and ubuntu xenial
-eth: 'ens6'
+# use eth1 for libvirt and ubuntu precise, enp0s8 for CentOS and ubuntu xenial
+eth: 'eth1'
 
 # Disks
 # For libvirt use disks: "[ '/dev/vdb', '/dev/vdc' ]"

diff --git a/tests/functional/lvm-osds/group_vars/all b/tests/functional/lvm-osds/group_vars/all
index 9e0b3a78a5a42f449b60d556ca86eadbe68618c8..2857469b99b149135036b04d6cd8f622fe472351 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: ens6
-radosgw_interface: ens6
+monitor_interface: eth1
+radosgw_interface: eth1
 journal_size: 100
 osd_objectstore: "filestore"
 copy_admin_key: true

diff --git a/tests/functional/lvm-osds/vagrant_variables.yml b/tests/functional/lvm-osds/vagrant_variables.yml
index c9274508e3cdfb41883d9586f60e9b67bca9aef1..6636233ccdc01b4c4a892911772369a92eaf3975 100644 (file)
--- a/tests/functional/lvm-osds/vagrant_variables.yml
+++ b/tests/functional/lvm-osds/vagrant_variables.yml
@@ -27,8 +27,8 @@ cluster_subnet: 192.168.40
 memory: 1024
 
 # Ethernet interface name
-# use ens6 for libvirt and ubuntu precise, enp0s8 for CentOS and ubuntu xenial
-eth: 'ens6'
+# use eth1 for libvirt and ubuntu precise, enp0s8 for CentOS and ubuntu xenial
+eth: 'eth1'
 
 # Disks
 # For libvirt use disks: "[ '/dev/vdb', '/dev/vdc' ]"

diff --git a/tests/functional/podman/group_vars/all b/tests/functional/podman/group_vars/all
index 1726d036a7d13dc65a1527a6cf72b8be95e8c2fb..2d4b6f92246bfc7f0069fdb2afa2f1d387bacba1 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"
-radosgw_interface: "ens6"
+monitor_interface: "{{ 'ens6' if ansible_distribution == 'RedHat' else 'eth1' }}"
+radosgw_interface: "{{ 'ens6' if ansible_distribution == 'RedHat' else 'eth1' }}"
 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 27f225818851852f3730390ead6bc9663ebe37cb..1949c21643c9621cc6f1d77ed2b474e067ba20ef 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: ens6
-radosgw_interface: ens6
+monitor_interface: eth1
+radosgw_interface: eth1
 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 e0f55c08e20c29909b7c4d415b0c86ff729f4e22..bb51d7930f76a81e9e35dc369e6b9ffbc39f5f57 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: ens6
-radosgw_interface: ens6
+monitor_interface: eth1
+radosgw_interface: eth1
 journal_size: 100
 osd_objectstore: "bluestore"
 osd_scenario: lvm

diff --git a/tests/functional/rgw-multisite/container/secondary/vagrant_variables.yml b/tests/functional/rgw-multisite/container/secondary/vagrant_variables.yml
index f71704ef8955bd130a796d2d76d460ab633e322c..74bb8616a4ee9062c9833798b982cf647d628e25 100644 (file)
--- a/tests/functional/rgw-multisite/container/secondary/vagrant_variables.yml
+++ b/tests/functional/rgw-multisite/container/secondary/vagrant_variables.yml
@@ -30,8 +30,8 @@ cluster_subnet: 192.168.108
 memory: 1024
 
 # Ethernet interface name
-# use ens6 for libvirt and ubuntu precise, enp0s8 for CentOS and ubuntu xenial
-eth: 'ens6'
+# use eth1 for libvirt and ubuntu precise, enp0s8 for CentOS and ubuntu xenial
+eth: 'eth1'
 
 # Disks
 # For libvirt use disks: "[ '/dev/vdb', '/dev/vdc' ]"

diff --git a/tests/functional/rgw-multisite/container/vagrant_variables.yml b/tests/functional/rgw-multisite/container/vagrant_variables.yml
index 53126bc9ac7381fdfc95ff9b0b5be69897d4218f..7ac4c64735a8909cfab9d047af4c8f13d5721354 100644 (file)
--- a/tests/functional/rgw-multisite/container/vagrant_variables.yml
+++ b/tests/functional/rgw-multisite/container/vagrant_variables.yml
@@ -30,8 +30,8 @@ cluster_subnet: 192.168.106
 memory: 1024
 
 # Ethernet interface name
-# use ens6 for libvirt and ubuntu precise, enp0s8 for CentOS and ubuntu xenial
-eth: 'ens6'
+# use eth1 for libvirt and ubuntu precise, enp0s8 for CentOS and ubuntu xenial
+eth: 'eth1'
 
 # Disks
 # For libvirt use disks: "[ '/dev/vdb', '/dev/vdc' ]"

diff --git a/tests/functional/rgw-multisite/group_vars/all b/tests/functional/rgw-multisite/group_vars/all
index d7bf7d6406ca04d5eb34d36e53d5b8f4988ed2af..3a9a13eb5b7be90fa03841f571c0e9c00a2c0e80 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: ens6
-radosgw_interface: ens6
+monitor_interface: eth1
+radosgw_interface: eth1
 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 97838b9d629f18e86b7e4505aef38d444c7d12f0..2b605f43eca482d120263676648be3197dc53bce 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: ens6
-radosgw_interface: ens6
+monitor_interface: eth1
+radosgw_interface: eth1
 journal_size: 100
 osd_objectstore: "bluestore"
 osd_scenario: lvm

diff --git a/tests/functional/rgw-multisite/secondary/vagrant_variables.yml b/tests/functional/rgw-multisite/secondary/vagrant_variables.yml
index 487d15cc0c24cd754c2fefcf87ffcba8d0d27345..80f58d09e80e53272353da34bf872f06111704e2 100644 (file)
--- a/tests/functional/rgw-multisite/secondary/vagrant_variables.yml
+++ b/tests/functional/rgw-multisite/secondary/vagrant_variables.yml
@@ -27,8 +27,8 @@ cluster_subnet: 192.168.104
 memory: 1024
 
 # Ethernet interface name
-# use ens6 for libvirt and ubuntu precise, enp0s8 for CentOS and ubuntu xenial
-eth: 'ens6'
+# use eth1 for libvirt and ubuntu precise, enp0s8 for CentOS and ubuntu xenial
+eth: 'eth1'
 
 # Disks
 # For libvirt use disks: "[ '/dev/vdb', '/dev/vdc' ]"

diff --git a/tests/functional/rgw-multisite/vagrant_variables.yml b/tests/functional/rgw-multisite/vagrant_variables.yml
index 3ecf14ff0f5e4bea034b98e846ff7136843ed6d7..a867b3391549618f44430db427f31a6c09bee1d4 100644 (file)
--- a/tests/functional/rgw-multisite/vagrant_variables.yml
+++ b/tests/functional/rgw-multisite/vagrant_variables.yml
@@ -27,8 +27,8 @@ cluster_subnet: 192.168.102
 memory: 1024
 
 # Ethernet interface name
-# use ens6 for libvirt and ubuntu precise, enp0s8 for CentOS and ubuntu xenial
-eth: 'ens6'
+# use eth1 for libvirt and ubuntu precise, enp0s8 for CentOS and ubuntu xenial
+eth: 'eth1'
 
 # Disks
 # For libvirt use disks: "[ '/dev/vdb', '/dev/vdc' ]"

diff --git a/tests/functional/rhcs_setup.yml b/tests/functional/rhcs_setup.yml
index 117895e28311336834aa64d7051d59f6b1550956..abbb4030f65d1d4b79f8e40d4ad0cb1aea906fe3 100644 (file)
--- a/tests/functional/rhcs_setup.yml
+++ b/tests/functional/rhcs_setup.yml
@@ -73,8 +73,8 @@
     - name: set MTU on eth0
       command: "ifconfig eth0 mtu 1400 up"
 
-    - name: set MTU on ens6
-      command: "ifconfig ens6 mtu 1400 up"
+    - name: set MTU on eth1
+      command: "ifconfig eth1 mtu 1400 up"
 
     - name: install docker
       package:

diff --git a/tests/functional/shrink_mon/container/group_vars/all b/tests/functional/shrink_mon/container/group_vars/all
index 94b3ec40e5939b14badad19ade44cb6cd1ee47ae..f0bdd3aed615b3a2978715d3f199e1c5c527465b 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: ens6
+monitor_interface: eth1
 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 03aa766cfa3e5226f6b22e915ff6d94682813d06..b2631e0834f7b28c73e2e4f419a0d57b4a5d6243 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=ens6
+mon1 monitor_interface=eth1
 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 29db602b35e5ec3a263a9defc826938f67f8625b..d72da6b7b4ba0226a33759716b7ee6cad78be1ac 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=ens6
+mon1 monitor_interface=eth1
 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 3955e73302b05253d2f14ed30dab18440e834b30..7e562adb7d916a550077b4f6ee951f131b41195d 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=ens6
+mon1 monitor_interface=eth1
 mon2 monitor_address=192.168.1.12
 
 [osds]

diff --git a/tests/functional/shrink_mon/vagrant_variables.yml b/tests/functional/shrink_mon/vagrant_variables.yml
index 789537537c95b86485ab001eb7d3133ccf48b7f5..826f25c0b4f3b7fd6360acca644e8732a6ed4e8e 100644 (file)
--- a/tests/functional/shrink_mon/vagrant_variables.yml
+++ b/tests/functional/shrink_mon/vagrant_variables.yml
@@ -27,8 +27,8 @@ cluster_subnet: 192.168.2
 memory: 1024
 
 # Ethernet interface name
-# use ens6 for libvirt and ubuntu precise, enp0s8 for CentOS and ubuntu xenial
-eth: 'ens6'
+# use eth1 for libvirt and ubuntu precise, enp0s8 for CentOS and ubuntu xenial
+eth: 'eth1'
 
 # Disks
 # For libvirt use disks: "[ '/dev/vdb', '/dev/vdc' ]"

diff --git a/tests/functional/shrink_osd/container/group_vars/all b/tests/functional/shrink_osd/container/group_vars/all
index 7a3bd33c020f4e2d69410412728fe80b58087878..a4806c26fd9532268be6a1f2ae248553a5f90ce2 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: ens6
+monitor_interface: eth1
 ceph_mon_docker_subnet: "{{ public_network }}"
 ceph_docker_on_openstack: False
 public_network: "192.168.73.0/24"

diff --git a/tests/functional/shrink_osd/vagrant_variables.yml b/tests/functional/shrink_osd/vagrant_variables.yml
index a21d8bb210f35c280d9b5d266d22d607b1ef5c8d..3d2771563d40e09904202342327f8142b817e1e9 100644 (file)
--- a/tests/functional/shrink_osd/vagrant_variables.yml
+++ b/tests/functional/shrink_osd/vagrant_variables.yml
@@ -27,8 +27,8 @@ cluster_subnet: 192.168.72
 memory: 1024
 
 # Ethernet interface name
-# use ens6 for libvirt and ubuntu precise, enp0s8 for CentOS and ubuntu xenial
-eth: 'ens6'
+# use eth1 for libvirt and ubuntu precise, enp0s8 for CentOS and ubuntu xenial
+eth: 'eth1'
 
 # Disks
 # For libvirt use disks: "[ '/dev/vdb', '/dev/vdc' ]"

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

diff --git a/vagrant_variables.yml.sample b/vagrant_variables.yml.sample
index d1110b674a303a852c9be9197b4a2e44b5875e62..be6818832947d885a488dcfee65c0b3a78b9b846 100644 (file)
--- a/vagrant_variables.yml.sample
+++ b/vagrant_variables.yml.sample
@@ -23,8 +23,8 @@ cluster_subnet: 192.168.43
 memory: 1024
 
 # Ethernet interface name
-# use ens6 for libvirt and ubuntu precise, enp0s8 for CentOS and ubuntu xenial
-eth: 'ens6'
+# use eth1 for libvirt and ubuntu precise, enp0s8 for CentOS and ubuntu xenial
+eth: 'eth1'
 
 # Disks
 # For Xenial use disks: [ '/dev/sdb', '/dev/sdc' ]