tests: rename the directory for xenial_cluster

Signed-off-by: Andrew Schoen <aschoen@redhat.com>

diff --git a/tests/functional/ubuntu/16.04/cluster/Vagrantfile b/tests/functional/ubuntu/16.04/cluster/Vagrantfile
new file mode 120000 (symlink)
index 0000000..dfd7436
--- /dev/null
+++ b/tests/functional/ubuntu/16.04/cluster/Vagrantfile
@@ -0,0 +1 @@
+../../../../../Vagrantfile
\ No newline at end of file

diff --git a/tests/functional/ubuntu/16.04/cluster/group_vars/all b/tests/functional/ubuntu/16.04/cluster/group_vars/all
new file mode 100644 (file)
index 0000000..9cb9f11
--- /dev/null
+++ b/tests/functional/ubuntu/16.04/cluster/group_vars/all
@@ -0,0 +1,14 @@
+---
+
+ceph_stable: True
+public_network: "192.168.5.0/24"
+cluster_network: "192.168.6.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/cluster/group_vars/osds b/tests/functional/ubuntu/16.04/cluster/group_vars/osds
new file mode 100644 (file)
index 0000000..ed9b23a
--- /dev/null
+++ b/tests/functional/ubuntu/16.04/cluster/group_vars/osds
@@ -0,0 +1,4 @@
+---
+os_tuning_params:
+  - { name: kernel.pid_max, value: 4194303 }
+  - { name: fs.file-max, value: 26234859 }

diff --git a/tests/functional/ubuntu/16.04/cluster/hosts b/tests/functional/ubuntu/16.04/cluster/hosts
new file mode 100644 (file)
index 0000000..b87a697
--- /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/ubuntu/16.04/cluster/scenario.py b/tests/functional/ubuntu/16.04/cluster/scenario.py
new file mode 100644 (file)
index 0000000..61e8061
--- /dev/null
+++ b/tests/functional/ubuntu/16.04/cluster/scenario.py
@@ -0,0 +1,36 @@
+# Basic information about ceph and its configuration
+ceph = {
+    'releases': ['infernalis', 'jewel'],
+    'cluster_name': 'ceph',
+    'subnet': '192.168.5',
+}
+
+# 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']
+    },
+    'osd0': {
+        'username': 'vagrant',
+        'components': []
+    },
+    'mds0': {
+        'username': 'vagrant',
+        'components': []
+    },
+    'rgw0': {
+        'username': 'vagrant',
+        'components': []
+    },
+}

diff --git a/tests/functional/ubuntu/16.04/cluster/vagrant_variables.yml b/tests/functional/ubuntu/16.04/cluster/vagrant_variables.yml
new file mode 100644 (file)
index 0000000..f894771
--- /dev/null
+++ b/tests/functional/ubuntu/16.04/cluster/vagrant_variables.yml
@@ -0,0 +1,73 @@
+---
+
+# DEPLOY CONTAINERIZED DAEMONS
+docker: false
+
+# DEFINE THE NUMBER OF VMS TO RUN
+mon_vms: 3
+osd_vms: 1
+mds_vms: 1
+rgw_vms: 1
+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.5
+cluster_subnet: 192.168.6
+
+# 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-osd-mds-rgw/Vagrantfile b/tests/functional/ubuntu/16.04/mon-osd-mds-rgw/Vagrantfile
deleted file mode 120000 (symlink)
index dfd7436..0000000
--- a/tests/functional/ubuntu/16.04/mon-osd-mds-rgw/Vagrantfile
+++ /dev/null
@@ -1 +0,0 @@
-../../../../../Vagrantfile
\ No newline at end of file

diff --git a/tests/functional/ubuntu/16.04/mon-osd-mds-rgw/group_vars/all b/tests/functional/ubuntu/16.04/mon-osd-mds-rgw/group_vars/all
deleted file mode 100644 (file)
index 9cb9f11..0000000
--- a/tests/functional/ubuntu/16.04/mon-osd-mds-rgw/group_vars/all
+++ /dev/null
@@ -1,14 +0,0 @@
----
-
-ceph_stable: True
-public_network: "192.168.5.0/24"
-cluster_network: "192.168.6.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-mds-rgw/group_vars/osds b/tests/functional/ubuntu/16.04/mon-osd-mds-rgw/group_vars/osds
deleted file mode 100644 (file)
index ed9b23a..0000000
--- a/tests/functional/ubuntu/16.04/mon-osd-mds-rgw/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-mds-rgw/hosts b/tests/functional/ubuntu/16.04/mon-osd-mds-rgw/hosts
deleted file mode 100644 (file)
index b87a697..0000000
--- a/tests/functional/ubuntu/16.04/mon-osd-mds-rgw/hosts
+++ /dev/null
@@ -1,13 +0,0 @@
-[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/ubuntu/16.04/mon-osd-mds-rgw/scenario.py b/tests/functional/ubuntu/16.04/mon-osd-mds-rgw/scenario.py
deleted file mode 100644 (file)
index 61e8061..0000000
--- a/tests/functional/ubuntu/16.04/mon-osd-mds-rgw/scenario.py
+++ /dev/null
@@ -1,36 +0,0 @@
-# Basic information about ceph and its configuration
-ceph = {
-    'releases': ['infernalis', 'jewel'],
-    'cluster_name': 'ceph',
-    'subnet': '192.168.5',
-}
-
-# 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']
-    },
-    'osd0': {
-        'username': 'vagrant',
-        'components': []
-    },
-    'mds0': {
-        'username': 'vagrant',
-        'components': []
-    },
-    'rgw0': {
-        'username': 'vagrant',
-        'components': []
-    },
-}

diff --git a/tests/functional/ubuntu/16.04/mon-osd-mds-rgw/vagrant_variables.yml b/tests/functional/ubuntu/16.04/mon-osd-mds-rgw/vagrant_variables.yml
deleted file mode 100644 (file)
index f894771..0000000
--- a/tests/functional/ubuntu/16.04/mon-osd-mds-rgw/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: 1
-mds_vms: 1
-rgw_vms: 1
-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.5
-cluster_subnet: 192.168.6
-
-# 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 31f4b209099cbbc6bb0c8ea900842a1f750523d5..1adbea8e0bd1de00f5dc83990e5500f1d4f86862 100644 (file)
--- a/tox.ini
+++ b/tox.ini
@@ -22,7 +22,7 @@ changedir=
   # 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