diff --git a/tests/functional/centos/7/mon-osd-mds-rgw/Vagrantfile b/tests/functional/centos/7/cluster/Vagrantfile similarity index 100% rename from tests/functional/centos/7/mon-osd-mds-rgw/Vagrantfile rename to tests/functional/centos/7/cluster/Vagrantfile diff --git a/tests/functional/centos/7/mon-osd-mds-rgw/group_vars/all b/tests/functional/centos/7/cluster/group_vars/all similarity index 100% rename from tests/functional/centos/7/mon-osd-mds-rgw/group_vars/all rename to tests/functional/centos/7/cluster/group_vars/all diff --git a/tests/functional/centos/7/mon-osd-mds-rgw/group_vars/osds b/tests/functional/centos/7/cluster/group_vars/osds similarity index 100% rename from tests/functional/centos/7/mon-osd-mds-rgw/group_vars/osds rename to tests/functional/centos/7/cluster/group_vars/osds diff --git a/tests/functional/centos/7/cluster/hosts b/tests/functional/centos/7/cluster/hosts new file mode 100644 index 000000000..b732c4154 --- /dev/null +++ b/tests/functional/centos/7/cluster/hosts @@ -0,0 +1,13 @@ +[mons] +mon0 monitor_address=192.168.1.10 +mon1 monitor_interface=eth1 +mon2 monitor_address=192.168.1.12 + +[osds] +osd0 + +[mdss] +mds0 + +[rgws] +rgw0 diff --git a/tests/functional/ubuntu/16.04/mon-osd-mds-rgw/scenario.py b/tests/functional/centos/7/cluster/scenario.py similarity index 68% rename from tests/functional/ubuntu/16.04/mon-osd-mds-rgw/scenario.py rename to tests/functional/centos/7/cluster/scenario.py index 4597b589f..658444f03 100644 --- a/tests/functional/ubuntu/16.04/mon-osd-mds-rgw/scenario.py +++ b/tests/functional/centos/7/cluster/scenario.py @@ -1,7 +1,8 @@ # Basic information about ceph and its configuration ceph = { 'releases': ['infernalis', 'jewel'], - 'cluster_name': 'ceph' + 'cluster_name': 'ceph', + 'subnet': '192.168.1', } # remote nodes to test, with anything specific to them that might be useful for @@ -10,7 +11,15 @@ ceph = { nodes = { 'mon0': { 'username': 'vagrant', - 'components': ['mon', 'mon_initial_members'] + 'components': ['conf_tests'] + }, + 'mon1': { + 'username': 'vagrant', + 'components': ['conf_tests'] + }, + 'mon2': { + 'username': 'vagrant', + 'components': ['conf_tests'] }, 'osd0': { 'username': 'vagrant', diff --git a/tests/functional/centos/7/mon-osd-mds-rgw/vagrant_variables.yml b/tests/functional/centos/7/cluster/vagrant_variables.yml similarity index 99% rename from tests/functional/centos/7/mon-osd-mds-rgw/vagrant_variables.yml rename to tests/functional/centos/7/cluster/vagrant_variables.yml index ac76f1d89..7eb80e799 100644 --- a/tests/functional/centos/7/mon-osd-mds-rgw/vagrant_variables.yml +++ b/tests/functional/centos/7/cluster/vagrant_variables.yml @@ -4,7 +4,7 @@ docker: false # DEFINE THE NUMBER OF VMS TO RUN -mon_vms: 1 +mon_vms: 3 osd_vms: 1 mds_vms: 1 rgw_vms: 1 diff --git a/tests/functional/centos/7/mon-osd-mds-rgw/hosts b/tests/functional/centos/7/mon-osd-mds-rgw/hosts deleted file mode 100644 index 356860f9b..000000000 --- a/tests/functional/centos/7/mon-osd-mds-rgw/hosts +++ /dev/null @@ -1,11 +0,0 @@ -[mons] -mon0 monitor_interface=eth1 - -[osds] -osd0 - -[mdss] -mds0 - -[rgws] -rgw0 diff --git a/tests/functional/ubuntu/16.04/mon-osd-mds-rgw/Vagrantfile b/tests/functional/ubuntu/16.04/cluster/Vagrantfile similarity index 100% rename from tests/functional/ubuntu/16.04/mon-osd-mds-rgw/Vagrantfile rename to tests/functional/ubuntu/16.04/cluster/Vagrantfile diff --git a/tests/functional/ubuntu/16.04/mon-osd-mds-rgw/group_vars/all b/tests/functional/ubuntu/16.04/cluster/group_vars/all similarity index 100% rename from tests/functional/ubuntu/16.04/mon-osd-mds-rgw/group_vars/all rename to tests/functional/ubuntu/16.04/cluster/group_vars/all diff --git a/tests/functional/ubuntu/16.04/mon-osd-mds-rgw/group_vars/osds b/tests/functional/ubuntu/16.04/cluster/group_vars/osds similarity index 100% rename from tests/functional/ubuntu/16.04/mon-osd-mds-rgw/group_vars/osds rename to tests/functional/ubuntu/16.04/cluster/group_vars/osds diff --git a/tests/functional/ubuntu/16.04/cluster/hosts b/tests/functional/ubuntu/16.04/cluster/hosts new file mode 100644 index 000000000..b87a69737 --- /dev/null +++ b/tests/functional/ubuntu/16.04/cluster/hosts @@ -0,0 +1,13 @@ +[mons] +mon0 monitor_address=192.168.5.10 +mon1 monitor_address=192.168.5.11 +mon2 monitor_interface=eth1 + +[osds] +osd0 + +[mdss] +mds0 + +[rgws] +rgw0 diff --git a/tests/functional/centos/7/mon-osd-mds-rgw/scenario.py b/tests/functional/ubuntu/16.04/cluster/scenario.py similarity index 68% rename from tests/functional/centos/7/mon-osd-mds-rgw/scenario.py rename to tests/functional/ubuntu/16.04/cluster/scenario.py index 4597b589f..61e80611a 100644 --- a/tests/functional/centos/7/mon-osd-mds-rgw/scenario.py +++ b/tests/functional/ubuntu/16.04/cluster/scenario.py @@ -1,7 +1,8 @@ # Basic information about ceph and its configuration ceph = { 'releases': ['infernalis', 'jewel'], - 'cluster_name': 'ceph' + 'cluster_name': 'ceph', + 'subnet': '192.168.5', } # remote nodes to test, with anything specific to them that might be useful for @@ -10,7 +11,15 @@ ceph = { nodes = { 'mon0': { 'username': 'vagrant', - 'components': ['mon', 'mon_initial_members'] + 'components': ['conf_tests'] + }, + 'mon1': { + 'username': 'vagrant', + 'components': ['conf_tests'] + }, + 'mon2': { + 'username': 'vagrant', + 'components': ['conf_tests'] }, 'osd0': { 'username': 'vagrant', diff --git a/tests/functional/ubuntu/16.04/mon-osd-mds-rgw/vagrant_variables.yml b/tests/functional/ubuntu/16.04/cluster/vagrant_variables.yml similarity index 99% rename from tests/functional/ubuntu/16.04/mon-osd-mds-rgw/vagrant_variables.yml rename to tests/functional/ubuntu/16.04/cluster/vagrant_variables.yml index 15e4c038f..f894771c0 100644 --- a/tests/functional/ubuntu/16.04/mon-osd-mds-rgw/vagrant_variables.yml +++ b/tests/functional/ubuntu/16.04/cluster/vagrant_variables.yml @@ -4,7 +4,7 @@ docker: false # DEFINE THE NUMBER OF VMS TO RUN -mon_vms: 1 +mon_vms: 3 osd_vms: 1 mds_vms: 1 rgw_vms: 1 diff --git a/tests/functional/ubuntu/16.04/mon-osd-mds-rgw/hosts b/tests/functional/ubuntu/16.04/mon-osd-mds-rgw/hosts deleted file mode 100644 index 356860f9b..000000000 --- a/tests/functional/ubuntu/16.04/mon-osd-mds-rgw/hosts +++ /dev/null @@ -1,11 +0,0 @@ -[mons] -mon0 monitor_interface=eth1 - -[osds] -osd0 - -[mdss] -mds0 - -[rgws] -rgw0 diff --git a/tests/functional/ubuntu/16.04/mon-osd/Vagrantfile b/tests/functional/ubuntu/16.04/mon-osd/Vagrantfile deleted file mode 120000 index dfd7436c9..000000000 --- a/tests/functional/ubuntu/16.04/mon-osd/Vagrantfile +++ /dev/null @@ -1 +0,0 @@ -../../../../../Vagrantfile \ No newline at end of file diff --git a/tests/functional/ubuntu/16.04/mon-osd/group_vars/all b/tests/functional/ubuntu/16.04/mon-osd/group_vars/all deleted file mode 100644 index 64626c5bb..000000000 --- a/tests/functional/ubuntu/16.04/mon-osd/group_vars/all +++ /dev/null @@ -1,14 +0,0 @@ ---- - -ceph_stable: True -public_network: "192.168.7.0/24" -cluster_network: "192.168.8.0/24" -journal_size: 100 -devices: - - '/dev/sdb' -raw_journal_devices: - - '/dev/sdc' -raw_multi_journal: True -os_tuning_params: - - { name: kernel.pid_max, value: 4194303 } - - { name: fs.file-max, value: 26234859 } diff --git a/tests/functional/ubuntu/16.04/mon-osd/group_vars/osds b/tests/functional/ubuntu/16.04/mon-osd/group_vars/osds deleted file mode 100644 index ed9b23ad1..000000000 --- a/tests/functional/ubuntu/16.04/mon-osd/group_vars/osds +++ /dev/null @@ -1,4 +0,0 @@ ---- -os_tuning_params: - - { name: kernel.pid_max, value: 4194303 } - - { name: fs.file-max, value: 26234859 } diff --git a/tests/functional/ubuntu/16.04/mon-osd/hosts b/tests/functional/ubuntu/16.04/mon-osd/hosts deleted file mode 100644 index 89721c03e..000000000 --- a/tests/functional/ubuntu/16.04/mon-osd/hosts +++ /dev/null @@ -1,5 +0,0 @@ -[mons] -mon0 monitor_interface=eth1 - -[osds] -osd0 diff --git a/tests/functional/ubuntu/16.04/mon-osd/scenario.py b/tests/functional/ubuntu/16.04/mon-osd/scenario.py deleted file mode 100644 index b017b8e5a..000000000 --- a/tests/functional/ubuntu/16.04/mon-osd/scenario.py +++ /dev/null @@ -1,19 +0,0 @@ -# Basic information about ceph and its configuration -ceph = { - 'releases': ['infernalis', 'jewel'], - 'cluster_name': 'ceph' -} - -# remote nodes to test, with anything specific to them that might be useful for -# tests to get. Each one of these can get requested as a py.test fixture to -# validate information. -nodes = { - 'mon0': { - 'username': 'vagrant', - 'components': ['mon', 'mon_initial_members'] - }, - 'osd0': { - 'username': 'vagrant', - 'components': ['mon', 'mon_initial_members'] - } -} diff --git a/tests/functional/ubuntu/16.04/mon-osd/vagrant_variables.yml b/tests/functional/ubuntu/16.04/mon-osd/vagrant_variables.yml deleted file mode 100644 index 84363f453..000000000 --- a/tests/functional/ubuntu/16.04/mon-osd/vagrant_variables.yml +++ /dev/null @@ -1,73 +0,0 @@ ---- - -# DEPLOY CONTAINERIZED DAEMONS -docker: false - -# DEFINE THE NUMBER OF VMS TO RUN -mon_vms: 1 -osd_vms: 1 -mds_vms: 0 -rgw_vms: 0 -nfs_vms: 0 -rbd_mirror_vms: 0 -client_vms: 0 -iscsi_gw_vms: 0 - -# Deploy RESTAPI on each of the Monitors -restapi: true - -# INSTALL SOURCE OF CEPH -# valid values are 'stable' and 'dev' -ceph_install_source: stable - -# SUBNETS TO USE FOR THE VMS -public_subnet: 192.168.7 -cluster_subnet: 192.168.8 - -# MEMORY -# set 1024 for CentOS -memory: 512 - -# Ethernet interface name -# use eth1 for libvirt and ubuntu precise, enp0s8 for CentOS and ubuntu xenial -eth: 'eth1' - -# Disks -# For libvirt use disks: "[ '/dev/vdb', '/dev/vdc' ]" -# For CentOS7 use disks: "[ '/dev/sda', '/dev/sdb' ]" -disks: "[ '/dev/sdb', '/dev/sdc' ]" - -# VAGRANT BOX -# Ceph boxes are *strongly* suggested. They are under better control and will -# not get updated frequently unless required for build systems. These are (for -# now): -# -# * ceph/ubuntu-xenial -# -# Ubuntu: ceph/ubuntu-xenial bento/ubuntu-16.04 or ubuntu/trusty64 or ubuntu/wily64 -# CentOS: bento/centos-7.1 or puppetlabs/centos-7.0-64-puppet -# libvirt CentOS: centos/7 -# parallels Ubuntu: parallels/ubuntu-14.04 -# Debian: deb/jessie-amd64 - be careful the storage controller is named 'SATA Controller' -# For more boxes have a look at: -# - https://atlas.hashicorp.com/boxes/search?utf8=✓&sort=&provider=virtualbox&q= -# - https://download.gluster.org/pub/gluster/purpleidea/vagrant/ -vagrant_box: ceph/ubuntu-xenial -#ssh_private_key_path: "~/.ssh/id_rsa" -# The sync directory changes based on vagrant box -# Set to /home/vagrant/sync for Centos/7, /home/{ user }/vagrant for openstack and defaults to /vagrant -#vagrant_sync_dir: /home/vagrant/sync -#vagrant_sync_dir: / -# Disables synced folder creation. Not needed for testing, will skip mounting -# the vagrant directory on the remote box regardless of the provider. -vagrant_disable_synced_folder: true -# VAGRANT URL -# This is a URL to download an image from an alternate location. vagrant_box -# above should be set to the filename of the image. -# Fedora virtualbox: https://download.fedoraproject.org/pub/fedora/linux/releases/22/Cloud/x86_64/Images/Fedora-Cloud-Base-Vagrant-22-20150521.x86_64.vagrant-virtualbox.box -# Fedora libvirt: https://download.fedoraproject.org/pub/fedora/linux/releases/22/Cloud/x86_64/Images/Fedora-Cloud-Base-Vagrant-22-20150521.x86_64.vagrant-libvirt.box -# vagrant_box_url: https://download.fedoraproject.org/pub/fedora/linux/releases/22/Cloud/x86_64/Images/Fedora-Cloud-Base-Vagrant-22-20150521.x86_64.vagrant-virtualbox.box - -os_tuning_params: - - { name: kernel.pid_max, value: 4194303 } - - { name: fs.file-max, value: 26234859 } diff --git a/tests/functional/ubuntu/16.04/mon/Vagrantfile b/tests/functional/ubuntu/16.04/mon/Vagrantfile deleted file mode 120000 index dfd7436c9..000000000 --- a/tests/functional/ubuntu/16.04/mon/Vagrantfile +++ /dev/null @@ -1 +0,0 @@ -../../../../../Vagrantfile \ No newline at end of file diff --git a/tests/functional/ubuntu/16.04/mon/group_vars/all b/tests/functional/ubuntu/16.04/mon/group_vars/all deleted file mode 100644 index a45a73af8..000000000 --- a/tests/functional/ubuntu/16.04/mon/group_vars/all +++ /dev/null @@ -1,13 +0,0 @@ ---- - -ceph_stable: True -public_network: "192.168.9.0/24" -cluster_network: "192.168.10.0/24" -journal_size: 100 -devices: - - '/dev/sdb' - - '/dev/sdc' -journal_collocation: True -os_tuning_params: - - { name: kernel.pid_max, value: 4194303 } - - { name: fs.file-max, value: 26234859 } diff --git a/tests/functional/ubuntu/16.04/mon/group_vars/osds b/tests/functional/ubuntu/16.04/mon/group_vars/osds deleted file mode 100644 index ed9b23ad1..000000000 --- a/tests/functional/ubuntu/16.04/mon/group_vars/osds +++ /dev/null @@ -1,4 +0,0 @@ ---- -os_tuning_params: - - { name: kernel.pid_max, value: 4194303 } - - { name: fs.file-max, value: 26234859 } diff --git a/tests/functional/ubuntu/16.04/mon/hosts b/tests/functional/ubuntu/16.04/mon/hosts deleted file mode 100644 index b988ffef6..000000000 --- a/tests/functional/ubuntu/16.04/mon/hosts +++ /dev/null @@ -1,4 +0,0 @@ -[mons] -mon0 monitor_address=192.168.9.10 -mon1 monitor_address=192.168.9.11 -mon2 monitor_interface=eth1 diff --git a/tests/functional/ubuntu/16.04/mon/scenario.py b/tests/functional/ubuntu/16.04/mon/scenario.py deleted file mode 100644 index 2a084bd85..000000000 --- a/tests/functional/ubuntu/16.04/mon/scenario.py +++ /dev/null @@ -1,23 +0,0 @@ -# Basic information about ceph and its configuration -ceph = { - 'releases': ['infernalis', 'jewel'], - 'cluster_name': 'ceph' -} - -# remote nodes to test, with anything specific to them that might be useful for -# tests to get. Each one of these can get requested as a py.test fixture to -# validate information. -nodes = { - 'mon0': { - 'username': 'vagrant', - 'components': ['conf_tests'] - }, - 'mon1': { - 'username': 'vagrant', - 'components': ['conf_tests'] - }, - 'mon2': { - 'username': 'vagrant', - 'components': ['conf_tests'] - }, -} diff --git a/tests/functional/ubuntu/16.04/mon/vagrant_variables.yml b/tests/functional/ubuntu/16.04/mon/vagrant_variables.yml deleted file mode 100644 index dea17e161..000000000 --- a/tests/functional/ubuntu/16.04/mon/vagrant_variables.yml +++ /dev/null @@ -1,73 +0,0 @@ ---- - -# DEPLOY CONTAINERIZED DAEMONS -docker: false - -# DEFINE THE NUMBER OF VMS TO RUN -mon_vms: 3 -osd_vms: 0 -mds_vms: 0 -rgw_vms: 0 -nfs_vms: 0 -rbd_mirror_vms: 0 -client_vms: 0 -iscsi_gw_vms: 0 - -# Deploy RESTAPI on each of the Monitors -restapi: true - -# INSTALL SOURCE OF CEPH -# valid values are 'stable' and 'dev' -ceph_install_source: stable - -# SUBNETS TO USE FOR THE VMS -public_subnet: 192.168.9 -cluster_subnet: 192.168.10 - -# MEMORY -# set 1024 for CentOS -memory: 512 - -# Ethernet interface name -# use eth1 for libvirt and ubuntu precise, enp0s8 for CentOS and ubuntu xenial -eth: 'eth1' - -# Disks -# For libvirt use disks: "[ '/dev/vdb', '/dev/vdc' ]" -# For CentOS7 use disks: "[ '/dev/sda', '/dev/sdb' ]" -disks: "[ '/dev/sdb', '/dev/sdc' ]" - -# VAGRANT BOX -# Ceph boxes are *strongly* suggested. They are under better control and will -# not get updated frequently unless required for build systems. These are (for -# now): -# -# * ceph/ubuntu-xenial -# -# Ubuntu: ceph/ubuntu-xenial bento/ubuntu-16.04 or ubuntu/trusty64 or ubuntu/wily64 -# CentOS: bento/centos-7.1 or puppetlabs/centos-7.0-64-puppet -# libvirt CentOS: centos/7 -# parallels Ubuntu: parallels/ubuntu-14.04 -# Debian: deb/jessie-amd64 - be careful the storage controller is named 'SATA Controller' -# For more boxes have a look at: -# - https://atlas.hashicorp.com/boxes/search?utf8=✓&sort=&provider=virtualbox&q= -# - https://download.gluster.org/pub/gluster/purpleidea/vagrant/ -vagrant_box: ceph/ubuntu-xenial -#ssh_private_key_path: "~/.ssh/id_rsa" -# The sync directory changes based on vagrant box -# Set to /home/vagrant/sync for Centos/7, /home/{ user }/vagrant for openstack and defaults to /vagrant -#vagrant_sync_dir: /home/vagrant/sync -#vagrant_sync_dir: / -# Disables synced folder creation. Not needed for testing, will skip mounting -# the vagrant directory on the remote box regardless of the provider. -vagrant_disable_synced_folder: true -# VAGRANT URL -# This is a URL to download an image from an alternate location. vagrant_box -# above should be set to the filename of the image. -# Fedora virtualbox: https://download.fedoraproject.org/pub/fedora/linux/releases/22/Cloud/x86_64/Images/Fedora-Cloud-Base-Vagrant-22-20150521.x86_64.vagrant-virtualbox.box -# Fedora libvirt: https://download.fedoraproject.org/pub/fedora/linux/releases/22/Cloud/x86_64/Images/Fedora-Cloud-Base-Vagrant-22-20150521.x86_64.vagrant-libvirt.box -# vagrant_box_url: https://download.fedoraproject.org/pub/fedora/linux/releases/22/Cloud/x86_64/Images/Fedora-Cloud-Base-Vagrant-22-20150521.x86_64.vagrant-virtualbox.box - -os_tuning_params: - - { name: kernel.pid_max, value: 4194303 } - - { name: fs.file-max, value: 26234859 } diff --git a/tox.ini b/tox.ini index 31f4b2090..5ee3d12bd 100644 --- a/tox.ini +++ b/tox.ini @@ -1,5 +1,5 @@ [tox] -envlist = {ansible2.2}-{xenial_conf_tests,xenial_mon_osd,xenial_cluster,journal_collocation,centos7_cluster,dmcrypt_journal,dmcrypt_journal_collocation,docker_cluster} +envlist = {ansible2.2}-{xenial_cluster,journal_collocation,centos7_cluster,dmcrypt_journal,dmcrypt_journal_collocation,docker_cluster} skipsdist = True [testenv] @@ -17,12 +17,8 @@ deps= ansible2.2: ansible==2.2 -r{toxinidir}/tests/requirements.txt changedir= - # test a 3 mon cluster and ensures ceph.conf is rendered correctly - xenial_conf_tests: {toxinidir}/tests/functional/ubuntu/16.04/mon - # tests a 1 mon 1 osd xenial cluster using raw_multi_journal OSD scenario - xenial_mon_osd: {toxinidir}/tests/functional/ubuntu/16.04/mon-osd # tests a 1 mon, 1 osd, 1 mds and 1 rgw xenial cluster using raw_multi_journal OSD scenario - xenial_cluster: {toxinidir}/tests/functional/ubuntu/16.04/mon-osd-mds-rgw + xenial_cluster: {toxinidir}/tests/functional/ubuntu/16.04/cluster # tests a 1 mon 1 osd centos7 cluster using journal_collocation OSD scenario journal_collocation: {toxinidir}/tests/functional/centos/7/journal-collocation # tests a 1 mon 1 osd centos7 cluster using dmcrypt_dedicated_journal OSD scenario @@ -30,7 +26,7 @@ changedir= # tests a 1 mon 1 osd centos7 cluster using dmcrypt_journal_collocation OSD scenario dmcrypt_journal_collocation: {toxinidir}/tests/functional/centos/7/dmcrypt-journal-collocation # tests a 1 mon, 1 osd, 1 mds and 1 rgw centos7 cluster using raw_multi_journal OSD scenario - centos7_cluster: {toxinidir}/tests/functional/centos/7/mon-osd-mds-rgw + centos7_cluster: {toxinidir}/tests/functional/centos/7/cluster # tests a 1 mon, 1 osd, 1 mds and 1 rgw centos7 cluster using docker docker_cluster: {toxinidir}/tests/functional/centos/7/docker-cluster commands=