From: Guillaume Abrioux Date: Fri, 22 Feb 2019 09:04:28 +0000 (+0100) Subject: Revert "tests: add ubuntu bionic support" X-Git-Tag: v4.0.0rc1~87 X-Git-Url: http://git.apps.os.sepia.ceph.com/?a=commitdiff_plain;h=2ed203da61f5fbef5cb440fb91a15cf8713615b1;p=ceph-ansible.git Revert "tests: add ubuntu bionic support" This reverts commit 33c09af2507101289e8524c91f2b48c5adbdf904. Signed-off-by: Guillaume Abrioux --- diff --git a/docs/source/index.rst b/docs/source/index.rst index f40856bd9..465f621b7 100644 --- 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 a86a3fb67..46cdce0d2 100644 --- 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 51c9f4a96..0ab95c9a6 100644 --- 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 5e3b40319..7ba959aff 100644 --- 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 cafd1ceeb..c0bf4174f 100644 --- 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 ae4a65387..0ac99d0ca 100644 --- 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 d7ce86d8a..167b60cc2 100644 --- 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 d5981820d..f9582c127 100644 --- 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 10431ea95..b1053d13c 100644 --- 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 6a7838bc4..1ba2e98c2 100644 --- 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 10e4451b1..5e11a1ce7 100644 --- 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 590c96ed4..3f8cafbe8 100644 --- 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 29db602b3..d72da6b7b 100644 --- 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 dff4a61a5..43f149c99 100644 --- 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 0a597c9b9..c1301ed30 100644 --- 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 2a7c803ce..6f4e785cc 100644 --- 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 145b8cbe4..6bf2bcd20 100644 --- 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 dcd60ff24..78e47df51 100644 --- 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 c9274508e..6636233cc 100644 --- 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 8bae91af6..fe3e7ab3e 100644 --- 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 2a9389f8d..48cb5d74a 100644 --- 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 109caf5c6..59714099d 100644 --- 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 b28750ed3..4d2b960cc 100644 --- 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 513ddf7fa..77e357824 100644 --- 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 af72416b5..278ca40b9 100644 --- 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 c9274508e..6636233cc 100644 --- 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 18e42c878..6ed0becf0 100644 --- 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 145b8cbe4..6bf2bcd20 100644 --- 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 4e76d474f..2e5daca3a 100644 --- 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 c9274508e..6636233cc 100644 --- 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 a722bf354..45e2df893 100644 --- 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 145b8cbe4..6bf2bcd20 100644 --- 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 9e0b3a78a..2857469b9 100644 --- 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 c9274508e..6636233cc 100644 --- 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 1726d036a..2d4b6f922 100644 --- 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 27f225818..1949c2164 100644 --- 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 e0f55c08e..bb51d7930 100644 --- 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 f71704ef8..74bb8616a 100644 --- 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 53126bc9a..7ac4c6473 100644 --- 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 d7bf7d640..3a9a13eb5 100644 --- 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 97838b9d6..2b605f43e 100644 --- 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 487d15cc0..80f58d09e 100644 --- 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 3ecf14ff0..a867b3391 100644 --- 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 117895e28..abbb4030f 100644 --- 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 94b3ec40e..f0bdd3aed 100644 --- 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 03aa766cf..b2631e083 100644 --- 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 29db602b3..d72da6b7b 100644 --- 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 3955e7330..7e562adb7 100644 --- 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 789537537..826f25c0b 100644 --- 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 7a3bd33c0..a4806c26f 100644 --- 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 a21d8bb21..3d2771563 100644 --- 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 14a9e6bf7..05084a1e1 100644 --- 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 d1110b674..be6818832 100644 --- 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' ]