ceph
/
ceph-ansible
mirror of https://github.com/ceph/ceph-ansible.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Revert "tests: add ubuntu bionic support" 

This reverts commit 33c09af250.

Signed-off-by: Guillaume Abrioux <gabrioux@redhat.com>
pull/3595/head
Guillaume Abrioux 2019-02-22 10:04:28 +01:00
parent 3d66e913f4
commit 2ed203da61
53 changed files with 98 additions and 91 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
docs/source/index.rst
View File

@ -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'

2
docs/source/testing/tests.rst
View File

@ -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

11
tests/conftest.py
View File

@ -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)

4
tests/functional/add-osds/container/group_vars/all
View File

@ -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

4
tests/functional/add-osds/container/vagrant_variables.yml
View File

@ -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' ]"

4
tests/functional/add-osds/group_vars/all
View File

@ -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

4
tests/functional/add-osds/vagrant_variables.yml
View File

@ -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' ]"

4
tests/functional/all_daemons/container/group_vars/all
View File

@ -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"

2
tests/functional/all_daemons/container/hosts
View File

@ -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]

2
tests/functional/all_daemons/container/hosts-ubuntu
View File

@ -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]

2
tests/functional/all_daemons/group_vars/all
View File

@ -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

2
tests/functional/all_daemons/hosts
View File

@ -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]

2
tests/functional/all_daemons/hosts-switch-to-containers
View File

@ -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]

2
tests/functional/all_daemons/hosts-ubuntu
View File

@ -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]

4
tests/functional/all_daemons/vagrant_variables.yml
View File

@ -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' ]"

2
tests/functional/bs-lvm-osds/container/group_vars/all
View File

@ -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

4
tests/functional/bs-lvm-osds/container/vagrant_variables.yml
View File

@ -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' ]"

2
tests/functional/bs-lvm-osds/group_vars/all
View File

@ -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

4
tests/functional/bs-lvm-osds/vagrant_variables.yml
View File

@ -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' ]"

4
tests/functional/collocation/container/group_vars/all
View File

@ -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

4
tests/functional/collocation/group_vars/all
View File

@ -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"

4
tests/functional/infra_lv_create/vagrant_variables.yml
View File

@ -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' ]"

4
tests/functional/lvm-auto-discovery/container/group_vars/all
View File

@ -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

4
tests/functional/lvm-auto-discovery/container/vagrant_variables.yml
View File

@ -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' ]"

4
tests/functional/lvm-auto-discovery/group_vars/all
View File

@ -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

4
tests/functional/lvm-auto-discovery/vagrant_variables.yml
View File

@ -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' ]"

4
tests/functional/lvm-batch/container/group_vars/all
View File

@ -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

4
tests/functional/lvm-batch/container/vagrant_variables.yml
View File

@ -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' ]"

4
tests/functional/lvm-batch/group_vars/all
View File

@ -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

4
tests/functional/lvm-batch/vagrant_variables.yml
View File

@ -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' ]"

4
tests/functional/lvm-osds/container/group_vars/all
View File

@ -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

4
tests/functional/lvm-osds/container/vagrant_variables.yml
View File

@ -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' ]"

4
tests/functional/lvm-osds/group_vars/all
View File

@ -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

4
tests/functional/lvm-osds/vagrant_variables.yml
View File

@ -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' ]"

4
tests/functional/podman/group_vars/all
View File

@ -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"

4
tests/functional/rgw-multisite/container/group_vars/all
View File

@ -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

4
tests/functional/rgw-multisite/container/secondary/group_vars/all
View File

@ -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

4
tests/functional/rgw-multisite/container/secondary/vagrant_variables.yml
View File

@ -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' ]"

4
tests/functional/rgw-multisite/container/vagrant_variables.yml
View File

@ -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' ]"

4
tests/functional/rgw-multisite/group_vars/all
View File

@ -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

4
tests/functional/rgw-multisite/secondary/group_vars/all
View File

@ -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

4
tests/functional/rgw-multisite/secondary/vagrant_variables.yml
View File

@ -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' ]"

4
tests/functional/rgw-multisite/vagrant_variables.yml
View File

@ -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' ]"

4
tests/functional/rhcs_setup.yml
View File

@ -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:

2
tests/functional/shrink_mon/container/group_vars/all
View File

@ -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"

2
tests/functional/shrink_mon/hosts
View File

@ -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]

2
tests/functional/shrink_mon/hosts-switch-to-containers
View File

@ -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]

2
tests/functional/shrink_mon/hosts-ubuntu
View File

@ -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]

4
tests/functional/shrink_mon/vagrant_variables.yml
View File

@ -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' ]"

2
tests/functional/shrink_osd/container/group_vars/all
View File

@ -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"

4
tests/functional/shrink_osd/vagrant_variables.yml
View File

@ -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' ]"

4
tests/functional/tests/rgw/test_rgw.py
View File

@ -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,

4
vagrant_variables.yml.sample
View File

@ -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' ]