diff --git a/docs/source/index.rst b/docs/source/index.rst index 465f621b7..f40856bd9 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: eth1 + monitor_interface: ens6 devices: - '/dev/sda' - '/dev/sdb' diff --git a/docs/source/testing/tests.rst b/docs/source/testing/tests.rst index 46cdce0d2..a86a3fb67 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 ``eth1`` interface +* ``address``: The IP for the ``ens6`` 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 0ab95c9a6..51c9f4a96 100644 --- a/tests/conftest.py +++ b/tests/conftest.py @@ -8,6 +8,8 @@ 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") @@ -17,8 +19,6 @@ 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,13 +30,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) diff --git a/tests/functional/add-osds/container/group_vars/all b/tests/functional/add-osds/container/group_vars/all index 7ba959aff..5e3b40319 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: eth1 -radosgw_interface: eth1 +monitor_interface: ens6 +radosgw_interface: ens6 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 c0bf4174f..cafd1ceeb 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 eth1 for libvirt and ubuntu precise, enp0s8 for CentOS and ubuntu xenial -eth: 'eth1' +# use ens6 for libvirt and ubuntu precise, enp0s8 for CentOS and ubuntu xenial +eth: 'ens6' # 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 0ac99d0ca..ae4a65387 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: eth1 -radosgw_interface: eth1 +monitor_interface: ens6 +radosgw_interface: ens6 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 167b60cc2..d7ce86d8a 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 eth1 for libvirt and ubuntu precise, enp0s8 for CentOS and ubuntu xenial -eth: 'eth1' +# use ens6 for libvirt and ubuntu precise, enp0s8 for CentOS and ubuntu xenial +eth: 'ens6' # 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 f9582c127..d5981820d 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: eth1 -radosgw_interface: eth1 +monitor_interface: ens6 +radosgw_interface: 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 b1053d13c..10431ea95 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=eth1 +mon1 monitor_interface=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 1ba2e98c2..6a7838bc4 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=eth1 +mon1 monitor_interface=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 5e11a1ce7..10e4451b1 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: eth1 +radosgw_interface: 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 3f8cafbe8..590c96ed4 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=eth1 +mon1 monitor_interface=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 d72da6b7b..29db602b3 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=eth1 +mon1 monitor_interface=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 43f149c99..dff4a61a5 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=eth1 +mon1 monitor_interface=ens6 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 c1301ed30..0a597c9b9 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 eth1 for libvirt and ubuntu precise, enp0s8 for CentOS and ubuntu xenial -eth: 'eth1' +# use ens6 for libvirt and ubuntu precise, enp0s8 for CentOS and ubuntu xenial +eth: 'ens6' # 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 6f4e785cc..2a7c803ce 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: eth1 +monitor_interface: ens6 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 6bf2bcd20..145b8cbe4 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 eth1 for libvirt and ubuntu precise, enp0s8 for CentOS and ubuntu xenial -eth: 'eth1' +# use ens6 for libvirt and ubuntu precise, enp0s8 for CentOS and ubuntu xenial +eth: 'ens6' # 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 78e47df51..dcd60ff24 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: eth1 +monitor_interface: ens6 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 6636233cc..c9274508e 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 eth1 for libvirt and ubuntu precise, enp0s8 for CentOS and ubuntu xenial -eth: 'eth1' +# use ens6 for libvirt and ubuntu precise, enp0s8 for CentOS and ubuntu xenial +eth: 'ens6' # 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 fe3e7ab3e..8bae91af6 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: eth1 -radosgw_interface: eth1 +monitor_interface: ens6 +radosgw_interface: 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 48cb5d74a..2a9389f8d 100644 --- 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: ens6 +radosgw_interface: ens6 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 59714099d..109caf5c6 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 eth1 for libvirt and ubuntu precise, enp0s8 for CentOS and ubuntu xenial -eth: 'eth1' +# use ens6 for libvirt and ubuntu precise, enp0s8 for CentOS and ubuntu xenial +eth: 'ens6' # 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 4d2b960cc..b28750ed3 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: eth1 -radosgw_interface: eth1 +monitor_interface: ens6 +radosgw_interface: ens6 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 77e357824..513ddf7fa 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 eth1 for libvirt and ubuntu precise, enp0s8 for CentOS and ubuntu xenial -eth: 'eth1' +# use ens6 for libvirt and ubuntu precise, enp0s8 for CentOS and ubuntu xenial +eth: 'ens6' # 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 278ca40b9..af72416b5 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: eth1 -radosgw_interface: eth1 +monitor_interface: ens6 +radosgw_interface: ens6 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 6636233cc..c9274508e 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 eth1 for libvirt and ubuntu precise, enp0s8 for CentOS and ubuntu xenial -eth: 'eth1' +# use ens6 for libvirt and ubuntu precise, enp0s8 for CentOS and ubuntu xenial +eth: 'ens6' # 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 6ed0becf0..18e42c878 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: eth1 -radosgw_interface: eth1 +monitor_interface: ens6 +radosgw_interface: ens6 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 6bf2bcd20..145b8cbe4 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 eth1 for libvirt and ubuntu precise, enp0s8 for CentOS and ubuntu xenial -eth: 'eth1' +# use ens6 for libvirt and ubuntu precise, enp0s8 for CentOS and ubuntu xenial +eth: 'ens6' # 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 2e5daca3a..4e76d474f 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: eth1 -radosgw_interface: eth1 +monitor_interface: ens6 +radosgw_interface: ens6 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 6636233cc..c9274508e 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 eth1 for libvirt and ubuntu precise, enp0s8 for CentOS and ubuntu xenial -eth: 'eth1' +# use ens6 for libvirt and ubuntu precise, enp0s8 for CentOS and ubuntu xenial +eth: 'ens6' # 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 45e2df893..a722bf354 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: eth1 -radosgw_interface: eth1 +monitor_interface: ens6 +radosgw_interface: ens6 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 6bf2bcd20..145b8cbe4 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 eth1 for libvirt and ubuntu precise, enp0s8 for CentOS and ubuntu xenial -eth: 'eth1' +# use ens6 for libvirt and ubuntu precise, enp0s8 for CentOS and ubuntu xenial +eth: 'ens6' # 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 2857469b9..9e0b3a78a 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: eth1 -radosgw_interface: eth1 +monitor_interface: ens6 +radosgw_interface: ens6 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 6636233cc..c9274508e 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 eth1 for libvirt and ubuntu precise, enp0s8 for CentOS and ubuntu xenial -eth: 'eth1' +# use ens6 for libvirt and ubuntu precise, enp0s8 for CentOS and ubuntu xenial +eth: 'ens6' # 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 2d4b6f922..1726d036a 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' if ansible_distribution == 'RedHat' else 'eth1' }}" -radosgw_interface: "{{ 'ens6' if ansible_distribution == 'RedHat' else 'eth1' }}" +monitor_interface: "ens6" +radosgw_interface: "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 1949c2164..27f225818 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: eth1 -radosgw_interface: eth1 +monitor_interface: ens6 +radosgw_interface: 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 bb51d7930..e0f55c08e 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: eth1 -radosgw_interface: eth1 +monitor_interface: ens6 +radosgw_interface: ens6 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 74bb8616a..f71704ef8 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 eth1 for libvirt and ubuntu precise, enp0s8 for CentOS and ubuntu xenial -eth: 'eth1' +# use ens6 for libvirt and ubuntu precise, enp0s8 for CentOS and ubuntu xenial +eth: 'ens6' # 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 7ac4c6473..53126bc9a 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 eth1 for libvirt and ubuntu precise, enp0s8 for CentOS and ubuntu xenial -eth: 'eth1' +# use ens6 for libvirt and ubuntu precise, enp0s8 for CentOS and ubuntu xenial +eth: 'ens6' # 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 3a9a13eb5..d7bf7d640 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: eth1 -radosgw_interface: eth1 +monitor_interface: ens6 +radosgw_interface: 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 2b605f43e..97838b9d6 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: eth1 -radosgw_interface: eth1 +monitor_interface: ens6 +radosgw_interface: ens6 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 80f58d09e..487d15cc0 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 eth1 for libvirt and ubuntu precise, enp0s8 for CentOS and ubuntu xenial -eth: 'eth1' +# use ens6 for libvirt and ubuntu precise, enp0s8 for CentOS and ubuntu xenial +eth: 'ens6' # 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 a867b3391..3ecf14ff0 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 eth1 for libvirt and ubuntu precise, enp0s8 for CentOS and ubuntu xenial -eth: 'eth1' +# use ens6 for libvirt and ubuntu precise, enp0s8 for CentOS and ubuntu xenial +eth: 'ens6' # Disks # For libvirt use disks: "[ '/dev/vdb', '/dev/vdc' ]" diff --git a/tests/functional/rhcs_setup.yml b/tests/functional/rhcs_setup.yml index abbb4030f..117895e28 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 eth1 - command: "ifconfig eth1 mtu 1400 up" + - name: set MTU on ens6 + command: "ifconfig ens6 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 f0bdd3aed..94b3ec40e 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: eth1 +monitor_interface: 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 b2631e083..03aa766cf 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=eth1 +mon1 monitor_interface=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 d72da6b7b..29db602b3 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=eth1 +mon1 monitor_interface=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 7e562adb7..3955e7330 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=eth1 +mon1 monitor_interface=ens6 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 826f25c0b..789537537 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 eth1 for libvirt and ubuntu precise, enp0s8 for CentOS and ubuntu xenial -eth: 'eth1' +# use ens6 for libvirt and ubuntu precise, enp0s8 for CentOS and ubuntu xenial +eth: 'ens6' # 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 a4806c26f..7a3bd33c0 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: eth1 +monitor_interface: ens6 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 3d2771563..a21d8bb21 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 eth1 for libvirt and ubuntu precise, enp0s8 for CentOS and ubuntu xenial -eth: 'eth1' +# use ens6 for libvirt and ubuntu precise, enp0s8 for CentOS and ubuntu xenial +eth: 'ens6' # 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 05084a1e1..14a9e6bf7 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 eth1 - ip_addr = host.interface("eth1").addresses[0] + # rgw frontends ip_addr is configured on ens6 + ip_addr = host.interface("ens6").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 be6818832..d1110b674 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 eth1 for libvirt and ubuntu precise, enp0s8 for CentOS and ubuntu xenial -eth: 'eth1' +# use ens6 for libvirt and ubuntu precise, enp0s8 for CentOS and ubuntu xenial +eth: 'ens6' # Disks # For Xenial use disks: [ '/dev/sdb', '/dev/sdc' ]