testing: change raw-multi-journal to journal-collocation

We want to test journal collocation here because we're gonna switch
xenial-cluster and centos7-cluster to use a dedicated journal.

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

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

diff --git a/tests/functional/centos/7/journal-collocation/group_vars/all b/tests/functional/centos/7/journal-collocation/group_vars/all
new file mode 100644 (file)
index 0000000..95e3436
--- /dev/null
+++ b/tests/functional/centos/7/journal-collocation/group_vars/all
@@ -0,0 +1,13 @@
+---
+
+ceph_stable: True
+public_network: "192.168.3.0/24"
+cluster_network: "192.168.4.0/24"
+journal_size: 100
+devices:
+  - '/dev/sda'
+  - '/dev/sdb'
+journal_collocation: True
+os_tuning_params:
+  - { name: kernel.pid_max, value: 4194303 }
+  - { name: fs.file-max, value: 26234859 }

diff --git a/tests/functional/centos/7/journal-collocation/group_vars/osds b/tests/functional/centos/7/journal-collocation/group_vars/osds
new file mode 100644 (file)
index 0000000..ed9b23a
--- /dev/null
+++ b/tests/functional/centos/7/journal-collocation/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/centos/7/journal-collocation/hosts b/tests/functional/centos/7/journal-collocation/hosts
new file mode 100644 (file)
index 0000000..89721c0
--- /dev/null
+++ b/tests/functional/centos/7/journal-collocation/hosts
@@ -0,0 +1,5 @@
+[mons]
+mon0 monitor_interface=eth1
+
+[osds]
+osd0

diff --git a/tests/functional/centos/7/journal-collocation/scenario.py b/tests/functional/centos/7/journal-collocation/scenario.py
new file mode 100644 (file)
index 0000000..44d5300
--- /dev/null
+++ b/tests/functional/centos/7/journal-collocation/scenario.py
@@ -0,0 +1,19 @@
+# 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': [],
+    },
+}

diff --git a/tests/functional/centos/7/journal-collocation/vagrant_variables.yml b/tests/functional/centos/7/journal-collocation/vagrant_variables.yml
new file mode 100644 (file)
index 0000000..ed27f6b
--- /dev/null
+++ b/tests/functional/centos/7/journal-collocation/vagrant_variables.yml
@@ -0,0 +1,73 @@
+---
+
+# 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.3
+cluster_subnet: 192.168.4
+
+# 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: centos/7
+#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/centos/7/raw-multi-journal/Vagrantfile b/tests/functional/centos/7/raw-multi-journal/Vagrantfile
deleted file mode 120000 (symlink)
index dfd7436..0000000
--- a/tests/functional/centos/7/raw-multi-journal/Vagrantfile
+++ /dev/null
@@ -1 +0,0 @@
-../../../../../Vagrantfile
\ No newline at end of file

diff --git a/tests/functional/centos/7/raw-multi-journal/group_vars/all b/tests/functional/centos/7/raw-multi-journal/group_vars/all
deleted file mode 100644 (file)
index 335f896..0000000
--- a/tests/functional/centos/7/raw-multi-journal/group_vars/all
+++ /dev/null
@@ -1,14 +0,0 @@
----
-
-ceph_stable: True
-public_network: "192.168.3.0/24"
-cluster_network: "192.168.4.0/24"
-journal_size: 100
-devices:
-  - '/dev/sda'
-raw_journal_devices:
-  - '/dev/sdb'
-raw_multi_journal: True
-os_tuning_params:
-  - { name: kernel.pid_max, value: 4194303 }
-  - { name: fs.file-max, value: 26234859 }

diff --git a/tests/functional/centos/7/raw-multi-journal/group_vars/osds b/tests/functional/centos/7/raw-multi-journal/group_vars/osds
deleted file mode 100644 (file)
index ed9b23a..0000000
--- a/tests/functional/centos/7/raw-multi-journal/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/centos/7/raw-multi-journal/hosts b/tests/functional/centos/7/raw-multi-journal/hosts
deleted file mode 100644 (file)
index 89721c0..0000000
--- a/tests/functional/centos/7/raw-multi-journal/hosts
+++ /dev/null
@@ -1,5 +0,0 @@
-[mons]
-mon0 monitor_interface=eth1
-
-[osds]
-osd0

diff --git a/tests/functional/centos/7/raw-multi-journal/scenario.py b/tests/functional/centos/7/raw-multi-journal/scenario.py
deleted file mode 100644 (file)
index 44d5300..0000000
--- a/tests/functional/centos/7/raw-multi-journal/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': [],
-    },
-}

diff --git a/tests/functional/centos/7/raw-multi-journal/vagrant_variables.yml b/tests/functional/centos/7/raw-multi-journal/vagrant_variables.yml
deleted file mode 100644 (file)
index ed27f6b..0000000
--- a/tests/functional/centos/7/raw-multi-journal/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.3
-cluster_subnet: 192.168.4
-
-# 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: centos/7
-#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 1a84fa6e90c61ef0f365b05852dd517b1641275a..a6806e2e8cb74130e82aebba445993bb6670799c 100644 (file)
--- a/tox.ini
+++ b/tox.ini
@@ -1,5 +1,5 @@
 [tox]
-envlist = {ansible2.2}-{xenial-conf-tests,xenial-mon-osd,xenial-cluster,raw-multi-journal,centos7-cluster,dmcrypt-journal,dmcrypt-journal-collocation}
+envlist = {ansible2.2}-{xenial-conf-tests,xenial-mon-osd,xenial-cluster,journal-collocation,centos7-cluster,dmcrypt-journal,dmcrypt-journal-collocation}
 skipsdist = True
 
 [testenv]
@@ -22,8 +22,8 @@ changedir=
   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 journal_collocation OSD scenario
   xenial-cluster: {toxinidir}/tests/functional/ubuntu/16.04/mon-osd-mds-rgw
-  # tests a 1 mon 1 osd centos7 cluster using raw_multi_journal OSD scenario
-  raw-multi-journal: {toxinidir}/tests/functional/centos/7/raw-multi-journal
+  # 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
   dmcrypt-journal: {toxinidir}/tests/functional/centos/7/dmcrypt-dedicated-journal
   # tests a 1 mon 1 osd centos7 cluster using dmcrypt_journal_collocation OSD scenario