]> git-server-git.apps.pok.os.sepia.ceph.com Git - ceph-ansible.git/commitdiff
tox: refact environment naming
authorGuillaume Abrioux <gabrioux@redhat.com>
Wed, 5 Dec 2018 22:19:48 +0000 (23:19 +0100)
committerSébastien Han <seb@redhat.com>
Thu, 24 Jan 2019 10:46:32 +0000 (11:46 +0100)
this commit refacts the way the environment are named by adding a factor
`{non_container,container}`. This will avoid a lot of duplicate
definition in tox.ini and bring kind of consistency.

Signed-off-by: Guillaume Abrioux <gabrioux@redhat.com>
97 files changed:
tests/functional/centos/7/add-osds-container/Vagrantfile [deleted symlink]
tests/functional/centos/7/add-osds-container/ceph-override.json [deleted symlink]
tests/functional/centos/7/add-osds-container/group_vars/all [deleted file]
tests/functional/centos/7/add-osds-container/hosts [deleted file]
tests/functional/centos/7/add-osds-container/hosts-2 [deleted file]
tests/functional/centos/7/add-osds-container/vagrant_variables.yml [deleted file]
tests/functional/centos/7/add-osds/container/Vagrantfile [new symlink]
tests/functional/centos/7/add-osds/container/ceph-override.json [new symlink]
tests/functional/centos/7/add-osds/container/group_vars/all [new file with mode: 0644]
tests/functional/centos/7/add-osds/container/hosts [new file with mode: 0644]
tests/functional/centos/7/add-osds/container/hosts-2 [new file with mode: 0644]
tests/functional/centos/7/add-osds/container/vagrant_variables.yml [new file with mode: 0644]
tests/functional/centos/7/bs-lvm-osds-container/Vagrantfile [deleted symlink]
tests/functional/centos/7/bs-lvm-osds-container/ceph-override.json [deleted symlink]
tests/functional/centos/7/bs-lvm-osds-container/group_vars/all [deleted file]
tests/functional/centos/7/bs-lvm-osds-container/hosts [deleted file]
tests/functional/centos/7/bs-lvm-osds-container/vagrant_variables.yml [deleted file]
tests/functional/centos/7/bs-lvm-osds/container/Vagrantfile [new symlink]
tests/functional/centos/7/bs-lvm-osds/container/ceph-override.json [new symlink]
tests/functional/centos/7/bs-lvm-osds/container/group_vars/all [new file with mode: 0644]
tests/functional/centos/7/bs-lvm-osds/container/hosts [new file with mode: 0644]
tests/functional/centos/7/bs-lvm-osds/container/vagrant_variables.yml [new file with mode: 0644]
tests/functional/centos/7/cluster/container/Vagrantfile [new symlink]
tests/functional/centos/7/cluster/container/ceph-override.json [new symlink]
tests/functional/centos/7/cluster/container/group_vars/all [new file with mode: 0644]
tests/functional/centos/7/cluster/container/group_vars/clients [new file with mode: 0644]
tests/functional/centos/7/cluster/container/group_vars/iscsigws [new file with mode: 0644]
tests/functional/centos/7/cluster/container/group_vars/mons [new file with mode: 0644]
tests/functional/centos/7/cluster/container/group_vars/osds [new file with mode: 0644]
tests/functional/centos/7/cluster/container/group_vars/rgws [new file with mode: 0644]
tests/functional/centos/7/cluster/container/hosts [new file with mode: 0644]
tests/functional/centos/7/cluster/container/vagrant_variables.yml [new file with mode: 0644]
tests/functional/centos/7/docker/Vagrantfile [deleted symlink]
tests/functional/centos/7/docker/ceph-override.json [deleted symlink]
tests/functional/centos/7/docker/group_vars/all [deleted file]
tests/functional/centos/7/docker/group_vars/clients [deleted file]
tests/functional/centos/7/docker/group_vars/iscsigws [deleted file]
tests/functional/centos/7/docker/group_vars/mons [deleted file]
tests/functional/centos/7/docker/group_vars/osds [deleted file]
tests/functional/centos/7/docker/group_vars/rgws [deleted file]
tests/functional/centos/7/docker/hosts [deleted file]
tests/functional/centos/7/docker/vagrant_variables.yml [deleted file]
tests/functional/centos/7/lvm-batch-container/Vagrantfile [deleted symlink]
tests/functional/centos/7/lvm-batch-container/ceph-override.json [deleted file]
tests/functional/centos/7/lvm-batch-container/group_vars/all [deleted file]
tests/functional/centos/7/lvm-batch-container/hosts [deleted file]
tests/functional/centos/7/lvm-batch-container/vagrant_variables.yml [deleted file]
tests/functional/centos/7/lvm-batch/container/Vagrantfile [new symlink]
tests/functional/centos/7/lvm-batch/container/ceph-override.json [new file with mode: 0644]
tests/functional/centos/7/lvm-batch/container/group_vars/all [new file with mode: 0644]
tests/functional/centos/7/lvm-batch/container/hosts [new file with mode: 0644]
tests/functional/centos/7/lvm-batch/container/vagrant_variables.yml [new file with mode: 0644]
tests/functional/centos/7/lvm-osds-container/Vagrantfile [deleted symlink]
tests/functional/centos/7/lvm-osds-container/ceph-override.json [deleted symlink]
tests/functional/centos/7/lvm-osds-container/group_vars/all [deleted file]
tests/functional/centos/7/lvm-osds-container/hosts [deleted file]
tests/functional/centos/7/lvm-osds-container/vagrant_variables.yml [deleted file]
tests/functional/centos/7/lvm-osds/container/Vagrantfile [new symlink]
tests/functional/centos/7/lvm-osds/container/ceph-override.json [new symlink]
tests/functional/centos/7/lvm-osds/container/group_vars/all [new file with mode: 0644]
tests/functional/centos/7/lvm-osds/container/hosts [new file with mode: 0644]
tests/functional/centos/7/lvm-osds/container/vagrant_variables.yml [new file with mode: 0644]
tests/functional/centos/7/rgw-multisite-container/Vagrantfile [deleted symlink]
tests/functional/centos/7/rgw-multisite-container/ceph-override.json [deleted symlink]
tests/functional/centos/7/rgw-multisite-container/group_vars/all [deleted file]
tests/functional/centos/7/rgw-multisite-container/group_vars/rgws [deleted file]
tests/functional/centos/7/rgw-multisite-container/hosts [deleted file]
tests/functional/centos/7/rgw-multisite-container/secondary/Vagrantfile [deleted symlink]
tests/functional/centos/7/rgw-multisite-container/secondary/group_vars/all [deleted file]
tests/functional/centos/7/rgw-multisite-container/secondary/group_vars/rgws [deleted file]
tests/functional/centos/7/rgw-multisite-container/secondary/hosts [deleted file]
tests/functional/centos/7/rgw-multisite-container/secondary/vagrant_variables.yml [deleted file]
tests/functional/centos/7/rgw-multisite-container/vagrant_variables.yml [deleted file]
tests/functional/centos/7/rgw-multisite/container/Vagrantfile [new symlink]
tests/functional/centos/7/rgw-multisite/container/ceph-override.json [new symlink]
tests/functional/centos/7/rgw-multisite/container/group_vars/all [new file with mode: 0644]
tests/functional/centos/7/rgw-multisite/container/group_vars/rgws [new file with mode: 0644]
tests/functional/centos/7/rgw-multisite/container/hosts [new file with mode: 0644]
tests/functional/centos/7/rgw-multisite/container/secondary/Vagrantfile [new symlink]
tests/functional/centos/7/rgw-multisite/container/secondary/group_vars/all [new file with mode: 0644]
tests/functional/centos/7/rgw-multisite/container/secondary/group_vars/rgws [new file with mode: 0644]
tests/functional/centos/7/rgw-multisite/container/secondary/hosts [new file with mode: 0644]
tests/functional/centos/7/rgw-multisite/container/secondary/vagrant_variables.yml [new file with mode: 0644]
tests/functional/centos/7/rgw-multisite/container/vagrant_variables.yml [new file with mode: 0644]
tests/functional/centos/7/shrink_osd/container/Vagrantfile [new symlink]
tests/functional/centos/7/shrink_osd/container/ceph-override.json [new symlink]
tests/functional/centos/7/shrink_osd/container/group_vars/all [new file with mode: 0644]
tests/functional/centos/7/shrink_osd/container/group_vars/osds [new file with mode: 0644]
tests/functional/centos/7/shrink_osd/container/hosts [new file with mode: 0644]
tests/functional/centos/7/shrink_osd/container/vagrant_variables.yml [new file with mode: 0644]
tests/functional/centos/7/shrink_osd_container/Vagrantfile [deleted symlink]
tests/functional/centos/7/shrink_osd_container/ceph-override.json [deleted symlink]
tests/functional/centos/7/shrink_osd_container/group_vars/all [deleted file]
tests/functional/centos/7/shrink_osd_container/group_vars/osds [deleted file]
tests/functional/centos/7/shrink_osd_container/hosts [deleted file]
tests/functional/centos/7/shrink_osd_container/vagrant_variables.yml [deleted file]
tox.ini

diff --git a/tests/functional/centos/7/add-osds-container/Vagrantfile b/tests/functional/centos/7/add-osds-container/Vagrantfile
deleted file mode 120000 (symlink)
index dfd7436..0000000
+++ /dev/null
@@ -1 +0,0 @@
-../../../../../Vagrantfile
\ No newline at end of file
diff --git a/tests/functional/centos/7/add-osds-container/ceph-override.json b/tests/functional/centos/7/add-osds-container/ceph-override.json
deleted file mode 120000 (symlink)
index 775cb00..0000000
+++ /dev/null
@@ -1 +0,0 @@
-../cluster/ceph-override.json
\ No newline at end of file
diff --git a/tests/functional/centos/7/add-osds-container/group_vars/all b/tests/functional/centos/7/add-osds-container/group_vars/all
deleted file mode 100644 (file)
index 9b1a6c3..0000000
+++ /dev/null
@@ -1,23 +0,0 @@
----
-docker: True
-ceph_origin: repository
-ceph_repository: community
-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
-journal_size: 100
-osd_objectstore: "bluestore"
-osd_scenario: lvm
-copy_admin_key: true
-# test-volume is created by tests/functional/lvm_setup.yml from /dev/sdb
-lvm_volumes:
-  - data: /dev/sda
-  - data: /dev/sdb
-os_tuning_params:
-  - { name: fs.file-max, value: 26234859 }
-ceph_conf_overrides:
-  global:
-    osd_pool_default_size: 1
diff --git a/tests/functional/centos/7/add-osds-container/hosts b/tests/functional/centos/7/add-osds-container/hosts
deleted file mode 100644 (file)
index f6a265a..0000000
+++ /dev/null
@@ -1,5 +0,0 @@
-[mons]
-mon0
-
-[osds]
-osd0
diff --git a/tests/functional/centos/7/add-osds-container/hosts-2 b/tests/functional/centos/7/add-osds-container/hosts-2
deleted file mode 100644 (file)
index 073437d..0000000
+++ /dev/null
@@ -1,6 +0,0 @@
-[mons]
-mon0
-
-[osds]
-osd0
-osd1
diff --git a/tests/functional/centos/7/add-osds-container/vagrant_variables.yml b/tests/functional/centos/7/add-osds-container/vagrant_variables.yml
deleted file mode 100644 (file)
index c9883ea..0000000
+++ /dev/null
@@ -1,70 +0,0 @@
----
-
-# DEPLOY CONTAINERIZED DAEMONS
-docker: false
-
-# DEFINE THE NUMBER OF VMS TO RUN
-mon_vms: 1
-osd_vms: 2
-mds_vms: 0
-rgw_vms: 0
-nfs_vms: 0
-rbd_mirror_vms: 0
-client_vms: 0
-iscsi_gw_vms: 0
-mgr_vms: 0
-
-# INSTALL SOURCE OF CEPH
-# valid values are 'stable' and 'dev'
-ceph_install_source: stable
-
-# SUBNETS TO USE FOR THE VMS
-public_subnet: 192.168.55
-cluster_subnet: 192.168.56
-
-# 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: /vagrant
-# 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: fs.file-max, value: 26234859 }
diff --git a/tests/functional/centos/7/add-osds/container/Vagrantfile b/tests/functional/centos/7/add-osds/container/Vagrantfile
new file mode 120000 (symlink)
index 0000000..9797e1c
--- /dev/null
@@ -0,0 +1 @@
+../../../../../../Vagrantfile
\ No newline at end of file
diff --git a/tests/functional/centos/7/add-osds/container/ceph-override.json b/tests/functional/centos/7/add-osds/container/ceph-override.json
new file mode 120000 (symlink)
index 0000000..24aaedd
--- /dev/null
@@ -0,0 +1 @@
+../../cluster/ceph-override.json
\ No newline at end of file
diff --git a/tests/functional/centos/7/add-osds/container/group_vars/all b/tests/functional/centos/7/add-osds/container/group_vars/all
new file mode 100644 (file)
index 0000000..9b1a6c3
--- /dev/null
@@ -0,0 +1,23 @@
+---
+docker: True
+ceph_origin: repository
+ceph_repository: community
+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
+journal_size: 100
+osd_objectstore: "bluestore"
+osd_scenario: lvm
+copy_admin_key: true
+# test-volume is created by tests/functional/lvm_setup.yml from /dev/sdb
+lvm_volumes:
+  - data: /dev/sda
+  - data: /dev/sdb
+os_tuning_params:
+  - { name: fs.file-max, value: 26234859 }
+ceph_conf_overrides:
+  global:
+    osd_pool_default_size: 1
diff --git a/tests/functional/centos/7/add-osds/container/hosts b/tests/functional/centos/7/add-osds/container/hosts
new file mode 100644 (file)
index 0000000..f6a265a
--- /dev/null
@@ -0,0 +1,5 @@
+[mons]
+mon0
+
+[osds]
+osd0
diff --git a/tests/functional/centos/7/add-osds/container/hosts-2 b/tests/functional/centos/7/add-osds/container/hosts-2
new file mode 100644 (file)
index 0000000..073437d
--- /dev/null
@@ -0,0 +1,6 @@
+[mons]
+mon0
+
+[osds]
+osd0
+osd1
diff --git a/tests/functional/centos/7/add-osds/container/vagrant_variables.yml b/tests/functional/centos/7/add-osds/container/vagrant_variables.yml
new file mode 100644 (file)
index 0000000..c9883ea
--- /dev/null
@@ -0,0 +1,70 @@
+---
+
+# DEPLOY CONTAINERIZED DAEMONS
+docker: false
+
+# DEFINE THE NUMBER OF VMS TO RUN
+mon_vms: 1
+osd_vms: 2
+mds_vms: 0
+rgw_vms: 0
+nfs_vms: 0
+rbd_mirror_vms: 0
+client_vms: 0
+iscsi_gw_vms: 0
+mgr_vms: 0
+
+# INSTALL SOURCE OF CEPH
+# valid values are 'stable' and 'dev'
+ceph_install_source: stable
+
+# SUBNETS TO USE FOR THE VMS
+public_subnet: 192.168.55
+cluster_subnet: 192.168.56
+
+# 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: /vagrant
+# 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: fs.file-max, value: 26234859 }
diff --git a/tests/functional/centos/7/bs-lvm-osds-container/Vagrantfile b/tests/functional/centos/7/bs-lvm-osds-container/Vagrantfile
deleted file mode 120000 (symlink)
index dfd7436..0000000
+++ /dev/null
@@ -1 +0,0 @@
-../../../../../Vagrantfile
\ No newline at end of file
diff --git a/tests/functional/centos/7/bs-lvm-osds-container/ceph-override.json b/tests/functional/centos/7/bs-lvm-osds-container/ceph-override.json
deleted file mode 120000 (symlink)
index 775cb00..0000000
+++ /dev/null
@@ -1 +0,0 @@
-../cluster/ceph-override.json
\ No newline at end of file
diff --git a/tests/functional/centos/7/bs-lvm-osds-container/group_vars/all b/tests/functional/centos/7/bs-lvm-osds-container/group_vars/all
deleted file mode 100644 (file)
index 6f4e785..0000000
+++ /dev/null
@@ -1,29 +0,0 @@
----
-
-# this is only here to let the CI tests know
-# that this scenario is using docker
-docker: True
-
-ceph_origin: repository
-ceph_repository: community
-containerized_deployment: True
-public_network: "192.168.39.0/24"
-cluster_network: "192.168.40.0/24"
-monitor_interface: eth1
-osd_objectstore: "bluestore"
-osd_scenario: lvm
-copy_admin_key: true
-# test-volume is created by tests/functional/lvm_setup.yml from /dev/sdb
-lvm_volumes:
-  - data: data-lv1
-    data_vg: test_group
-  - data: data-lv2
-    data_vg: test_group
-    db: journal1
-    db_vg: journals
-os_tuning_params:
-  - { name: fs.file-max, value: 26234859 }
-ceph_conf_overrides:
-  global:
-    osd_pool_default_size: 1
-ceph_osd_docker_run_script_path: /var/tmp
\ No newline at end of file
diff --git a/tests/functional/centos/7/bs-lvm-osds-container/hosts b/tests/functional/centos/7/bs-lvm-osds-container/hosts
deleted file mode 100644 (file)
index f6a265a..0000000
+++ /dev/null
@@ -1,5 +0,0 @@
-[mons]
-mon0
-
-[osds]
-osd0
diff --git a/tests/functional/centos/7/bs-lvm-osds-container/vagrant_variables.yml b/tests/functional/centos/7/bs-lvm-osds-container/vagrant_variables.yml
deleted file mode 100644 (file)
index bd83094..0000000
+++ /dev/null
@@ -1,73 +0,0 @@
----
-
-# DEPLOY CONTAINERIZED DAEMONS
-docker: true
-
-# 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
-mgr_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.39
-cluster_subnet: 192.168.40
-
-# 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/atomic-host
-#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: /vagrant
-# 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: fs.file-max, value: 26234859 }
diff --git a/tests/functional/centos/7/bs-lvm-osds/container/Vagrantfile b/tests/functional/centos/7/bs-lvm-osds/container/Vagrantfile
new file mode 120000 (symlink)
index 0000000..dfd7436
--- /dev/null
@@ -0,0 +1 @@
+../../../../../Vagrantfile
\ No newline at end of file
diff --git a/tests/functional/centos/7/bs-lvm-osds/container/ceph-override.json b/tests/functional/centos/7/bs-lvm-osds/container/ceph-override.json
new file mode 120000 (symlink)
index 0000000..775cb00
--- /dev/null
@@ -0,0 +1 @@
+../cluster/ceph-override.json
\ No newline at end of file
diff --git a/tests/functional/centos/7/bs-lvm-osds/container/group_vars/all b/tests/functional/centos/7/bs-lvm-osds/container/group_vars/all
new file mode 100644 (file)
index 0000000..6f4e785
--- /dev/null
@@ -0,0 +1,29 @@
+---
+
+# this is only here to let the CI tests know
+# that this scenario is using docker
+docker: True
+
+ceph_origin: repository
+ceph_repository: community
+containerized_deployment: True
+public_network: "192.168.39.0/24"
+cluster_network: "192.168.40.0/24"
+monitor_interface: eth1
+osd_objectstore: "bluestore"
+osd_scenario: lvm
+copy_admin_key: true
+# test-volume is created by tests/functional/lvm_setup.yml from /dev/sdb
+lvm_volumes:
+  - data: data-lv1
+    data_vg: test_group
+  - data: data-lv2
+    data_vg: test_group
+    db: journal1
+    db_vg: journals
+os_tuning_params:
+  - { name: fs.file-max, value: 26234859 }
+ceph_conf_overrides:
+  global:
+    osd_pool_default_size: 1
+ceph_osd_docker_run_script_path: /var/tmp
\ No newline at end of file
diff --git a/tests/functional/centos/7/bs-lvm-osds/container/hosts b/tests/functional/centos/7/bs-lvm-osds/container/hosts
new file mode 100644 (file)
index 0000000..f6a265a
--- /dev/null
@@ -0,0 +1,5 @@
+[mons]
+mon0
+
+[osds]
+osd0
diff --git a/tests/functional/centos/7/bs-lvm-osds/container/vagrant_variables.yml b/tests/functional/centos/7/bs-lvm-osds/container/vagrant_variables.yml
new file mode 100644 (file)
index 0000000..bd83094
--- /dev/null
@@ -0,0 +1,73 @@
+---
+
+# DEPLOY CONTAINERIZED DAEMONS
+docker: true
+
+# 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
+mgr_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.39
+cluster_subnet: 192.168.40
+
+# 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/atomic-host
+#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: /vagrant
+# 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: fs.file-max, value: 26234859 }
diff --git a/tests/functional/centos/7/cluster/container/Vagrantfile b/tests/functional/centos/7/cluster/container/Vagrantfile
new file mode 120000 (symlink)
index 0000000..9797e1c
--- /dev/null
@@ -0,0 +1 @@
+../../../../../../Vagrantfile
\ No newline at end of file
diff --git a/tests/functional/centos/7/cluster/container/ceph-override.json b/tests/functional/centos/7/cluster/container/ceph-override.json
new file mode 120000 (symlink)
index 0000000..24aaedd
--- /dev/null
@@ -0,0 +1 @@
+../../cluster/ceph-override.json
\ No newline at end of file
diff --git a/tests/functional/centos/7/cluster/container/group_vars/all b/tests/functional/centos/7/cluster/container/group_vars/all
new file mode 100644 (file)
index 0000000..c9d554b
--- /dev/null
@@ -0,0 +1,40 @@
+---
+# this is only here to let the CI tests know
+# that this scenario is using docker
+docker: True
+
+containerized_deployment: True
+monitor_interface: eth1
+radosgw_interface: eth1
+radosgw_num_instances: 2
+ceph_mon_docker_subnet: "{{ public_network }}"
+ceph_docker_on_openstack: False
+public_network: "192.168.17.0/24"
+cluster_network: "192.168.18.0/24"
+rgw_override_bucket_index_max_shards: 16
+rgw_bucket_default_quota_max_objects: 1638400
+ceph_conf_overrides:
+  global:
+    osd_pool_default_size: 1
+openstack_config: True
+openstack_glance_pool:
+  name: "images"
+  pg_num: "{{ osd_pool_default_pg_num }}"
+  pgp_num: "{{ osd_pool_default_pg_num }}"
+  rule_name: "HDD"
+  type: 1
+  erasure_profile: ""
+  expected_num_objects: ""
+  size: 1
+openstack_cinder_pool:
+  name: "volumes"
+  pg_num: "{{ osd_pool_default_pg_num }}"
+  pgp_num: "{{ osd_pool_default_pg_num }}"
+  rule_name: "HDD"
+  type: 1
+  erasure_profile: ""
+  expected_num_objects: ""
+  size: 1
+openstack_pools:
+  - "{{ openstack_glance_pool }}"
+  - "{{ openstack_cinder_pool }}"
diff --git a/tests/functional/centos/7/cluster/container/group_vars/clients b/tests/functional/centos/7/cluster/container/group_vars/clients
new file mode 100644 (file)
index 0000000..a8ea366
--- /dev/null
@@ -0,0 +1,22 @@
+---
+user_config: True
+copy_admin_key: True
+test:
+  name: "test"
+  pg_num: "{{ osd_pool_default_pg_num }}"
+  pgp_num: "{{ osd_pool_default_pg_num }}"
+  rule_name: "HDD"
+  type: 1
+  erasure_profile: ""
+  expected_num_objects: ""
+test2:
+  name: "test2"
+  pg_num: "{{ osd_pool_default_pg_num }}"
+  pgp_num: "{{ osd_pool_default_pg_num }}"
+  rule_name: "HDD"
+  type: 1
+  erasure_profile: ""
+  expected_num_objects: ""
+pools:
+  - "{{ test }}"
+  - "{{ test2 }}"
diff --git a/tests/functional/centos/7/cluster/container/group_vars/iscsigws b/tests/functional/centos/7/cluster/container/group_vars/iscsigws
new file mode 100644 (file)
index 0000000..401805e
--- /dev/null
@@ -0,0 +1,3 @@
+---
+gateway_ip_list: 192.168.1.90
+generate_crt: True
\ No newline at end of file
diff --git a/tests/functional/centos/7/cluster/container/group_vars/mons b/tests/functional/centos/7/cluster/container/group_vars/mons
new file mode 100644 (file)
index 0000000..4b54059
--- /dev/null
@@ -0,0 +1,10 @@
+---
+create_crush_tree: True
+crush_rule_config: True
+crush_rule_hdd:
+  name: HDD
+  root: HDD
+  type: host
+  default: true
+crush_rules:
+  - "{{ crush_rule_hdd }}"
diff --git a/tests/functional/centos/7/cluster/container/group_vars/osds b/tests/functional/centos/7/cluster/container/group_vars/osds
new file mode 100644 (file)
index 0000000..672a0f9
--- /dev/null
@@ -0,0 +1,11 @@
+---
+ceph_osd_docker_run_script_path: /var/tmp
+osd_objectstore: "bluestore"
+osd_scenario: lvm
+lvm_volumes:
+  - data: data-lv1
+    data_vg: test_group
+  - data: data-lv2
+    data_vg: test_group
+    db: journal1
+    db_vg: journals
\ No newline at end of file
diff --git a/tests/functional/centos/7/cluster/container/group_vars/rgws b/tests/functional/centos/7/cluster/container/group_vars/rgws
new file mode 100644 (file)
index 0000000..8f2a9a3
--- /dev/null
@@ -0,0 +1,7 @@
+---
+copy_admin_key: True
+rgw_create_pools:
+  foo:
+    pg_num: 17
+  bar:
+    pg_num: 19
diff --git a/tests/functional/centos/7/cluster/container/hosts b/tests/functional/centos/7/cluster/container/hosts
new file mode 100644 (file)
index 0000000..0425679
--- /dev/null
@@ -0,0 +1,27 @@
+[mons]
+mon0
+mon1
+mon2
+
+[osds]
+osd0 osd_crush_location="{ 'root': 'HDD', 'rack': 'mon-rackkkk', 'pod': 'monpod', 'host': 'osd0' }"
+osd1 osd_crush_location="{ 'root': 'default', 'host': 'osd1' }"
+
+[mdss]
+mds0
+
+[rgws]
+rgw0
+
+#[nfss]
+#nfs0
+
+[clients]
+client0
+client1
+
+[rbdmirrors]
+rbd-mirror0
+
+[iscsigws]
+iscsi-gw0
diff --git a/tests/functional/centos/7/cluster/container/vagrant_variables.yml b/tests/functional/centos/7/cluster/container/vagrant_variables.yml
new file mode 100644 (file)
index 0000000..78166da
--- /dev/null
@@ -0,0 +1,60 @@
+---
+
+# DEPLOY CONTAINERIZED DAEMONS
+docker: True
+
+# DEFINE THE NUMBER OF VMS TO RUN
+mon_vms: 3
+osd_vms: 2
+mds_vms: 1
+rgw_vms: 1
+nfs_vms: 0
+rbd_mirror_vms: 1
+client_vms: 2
+iscsi_gw_vms: 1
+mgr_vms: 0
+
+# SUBNETS TO USE FOR THE VMS
+public_subnet: 192.168.17
+cluster_subnet: 192.168.18
+
+# MEMORY
+# set 1024 for CentOS
+memory: 1024
+
+# Disks
+# For libvirt use disks: "[ '/dev/vdb', '/dev/vdc' ]"
+# For CentOS7 use disks: "[ '/dev/sda', '/dev/sdb' ]"
+disks: "[ '/dev/sda', '/dev/sdb' ]"
+
+# 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/atomic-host
+#client_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: /vagrant
+# 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
diff --git a/tests/functional/centos/7/docker/Vagrantfile b/tests/functional/centos/7/docker/Vagrantfile
deleted file mode 120000 (symlink)
index dfd7436..0000000
+++ /dev/null
@@ -1 +0,0 @@
-../../../../../Vagrantfile
\ No newline at end of file
diff --git a/tests/functional/centos/7/docker/ceph-override.json b/tests/functional/centos/7/docker/ceph-override.json
deleted file mode 120000 (symlink)
index 775cb00..0000000
+++ /dev/null
@@ -1 +0,0 @@
-../cluster/ceph-override.json
\ No newline at end of file
diff --git a/tests/functional/centos/7/docker/group_vars/all b/tests/functional/centos/7/docker/group_vars/all
deleted file mode 100644 (file)
index c9d554b..0000000
+++ /dev/null
@@ -1,40 +0,0 @@
----
-# this is only here to let the CI tests know
-# that this scenario is using docker
-docker: True
-
-containerized_deployment: True
-monitor_interface: eth1
-radosgw_interface: eth1
-radosgw_num_instances: 2
-ceph_mon_docker_subnet: "{{ public_network }}"
-ceph_docker_on_openstack: False
-public_network: "192.168.17.0/24"
-cluster_network: "192.168.18.0/24"
-rgw_override_bucket_index_max_shards: 16
-rgw_bucket_default_quota_max_objects: 1638400
-ceph_conf_overrides:
-  global:
-    osd_pool_default_size: 1
-openstack_config: True
-openstack_glance_pool:
-  name: "images"
-  pg_num: "{{ osd_pool_default_pg_num }}"
-  pgp_num: "{{ osd_pool_default_pg_num }}"
-  rule_name: "HDD"
-  type: 1
-  erasure_profile: ""
-  expected_num_objects: ""
-  size: 1
-openstack_cinder_pool:
-  name: "volumes"
-  pg_num: "{{ osd_pool_default_pg_num }}"
-  pgp_num: "{{ osd_pool_default_pg_num }}"
-  rule_name: "HDD"
-  type: 1
-  erasure_profile: ""
-  expected_num_objects: ""
-  size: 1
-openstack_pools:
-  - "{{ openstack_glance_pool }}"
-  - "{{ openstack_cinder_pool }}"
diff --git a/tests/functional/centos/7/docker/group_vars/clients b/tests/functional/centos/7/docker/group_vars/clients
deleted file mode 100644 (file)
index a8ea366..0000000
+++ /dev/null
@@ -1,22 +0,0 @@
----
-user_config: True
-copy_admin_key: True
-test:
-  name: "test"
-  pg_num: "{{ osd_pool_default_pg_num }}"
-  pgp_num: "{{ osd_pool_default_pg_num }}"
-  rule_name: "HDD"
-  type: 1
-  erasure_profile: ""
-  expected_num_objects: ""
-test2:
-  name: "test2"
-  pg_num: "{{ osd_pool_default_pg_num }}"
-  pgp_num: "{{ osd_pool_default_pg_num }}"
-  rule_name: "HDD"
-  type: 1
-  erasure_profile: ""
-  expected_num_objects: ""
-pools:
-  - "{{ test }}"
-  - "{{ test2 }}"
diff --git a/tests/functional/centos/7/docker/group_vars/iscsigws b/tests/functional/centos/7/docker/group_vars/iscsigws
deleted file mode 100644 (file)
index 401805e..0000000
+++ /dev/null
@@ -1,3 +0,0 @@
----
-gateway_ip_list: 192.168.1.90
-generate_crt: True
\ No newline at end of file
diff --git a/tests/functional/centos/7/docker/group_vars/mons b/tests/functional/centos/7/docker/group_vars/mons
deleted file mode 100644 (file)
index 4b54059..0000000
+++ /dev/null
@@ -1,10 +0,0 @@
----
-create_crush_tree: True
-crush_rule_config: True
-crush_rule_hdd:
-  name: HDD
-  root: HDD
-  type: host
-  default: true
-crush_rules:
-  - "{{ crush_rule_hdd }}"
diff --git a/tests/functional/centos/7/docker/group_vars/osds b/tests/functional/centos/7/docker/group_vars/osds
deleted file mode 100644 (file)
index 672a0f9..0000000
+++ /dev/null
@@ -1,11 +0,0 @@
----
-ceph_osd_docker_run_script_path: /var/tmp
-osd_objectstore: "bluestore"
-osd_scenario: lvm
-lvm_volumes:
-  - data: data-lv1
-    data_vg: test_group
-  - data: data-lv2
-    data_vg: test_group
-    db: journal1
-    db_vg: journals
\ No newline at end of file
diff --git a/tests/functional/centos/7/docker/group_vars/rgws b/tests/functional/centos/7/docker/group_vars/rgws
deleted file mode 100644 (file)
index 8f2a9a3..0000000
+++ /dev/null
@@ -1,7 +0,0 @@
----
-copy_admin_key: True
-rgw_create_pools:
-  foo:
-    pg_num: 17
-  bar:
-    pg_num: 19
diff --git a/tests/functional/centos/7/docker/hosts b/tests/functional/centos/7/docker/hosts
deleted file mode 100644 (file)
index 0425679..0000000
+++ /dev/null
@@ -1,27 +0,0 @@
-[mons]
-mon0
-mon1
-mon2
-
-[osds]
-osd0 osd_crush_location="{ 'root': 'HDD', 'rack': 'mon-rackkkk', 'pod': 'monpod', 'host': 'osd0' }"
-osd1 osd_crush_location="{ 'root': 'default', 'host': 'osd1' }"
-
-[mdss]
-mds0
-
-[rgws]
-rgw0
-
-#[nfss]
-#nfs0
-
-[clients]
-client0
-client1
-
-[rbdmirrors]
-rbd-mirror0
-
-[iscsigws]
-iscsi-gw0
diff --git a/tests/functional/centos/7/docker/vagrant_variables.yml b/tests/functional/centos/7/docker/vagrant_variables.yml
deleted file mode 100644 (file)
index 78166da..0000000
+++ /dev/null
@@ -1,60 +0,0 @@
----
-
-# DEPLOY CONTAINERIZED DAEMONS
-docker: True
-
-# DEFINE THE NUMBER OF VMS TO RUN
-mon_vms: 3
-osd_vms: 2
-mds_vms: 1
-rgw_vms: 1
-nfs_vms: 0
-rbd_mirror_vms: 1
-client_vms: 2
-iscsi_gw_vms: 1
-mgr_vms: 0
-
-# SUBNETS TO USE FOR THE VMS
-public_subnet: 192.168.17
-cluster_subnet: 192.168.18
-
-# MEMORY
-# set 1024 for CentOS
-memory: 1024
-
-# Disks
-# For libvirt use disks: "[ '/dev/vdb', '/dev/vdc' ]"
-# For CentOS7 use disks: "[ '/dev/sda', '/dev/sdb' ]"
-disks: "[ '/dev/sda', '/dev/sdb' ]"
-
-# 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/atomic-host
-#client_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: /vagrant
-# 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
diff --git a/tests/functional/centos/7/lvm-batch-container/Vagrantfile b/tests/functional/centos/7/lvm-batch-container/Vagrantfile
deleted file mode 120000 (symlink)
index dfd7436..0000000
+++ /dev/null
@@ -1 +0,0 @@
-../../../../../Vagrantfile
\ No newline at end of file
diff --git a/tests/functional/centos/7/lvm-batch-container/ceph-override.json b/tests/functional/centos/7/lvm-batch-container/ceph-override.json
deleted file mode 100644 (file)
index 1a9600a..0000000
+++ /dev/null
@@ -1,9 +0,0 @@
-{
-       "ceph_conf_overrides": {
-               "global": {
-                       "osd_pool_default_pg_num": 12,
-                       "osd_pool_default_size": 1
-               }
-       },
-  "ceph_mon_docker_memory_limit": "2g"
-}
diff --git a/tests/functional/centos/7/lvm-batch-container/group_vars/all b/tests/functional/centos/7/lvm-batch-container/group_vars/all
deleted file mode 100644 (file)
index 6ed0bec..0000000
+++ /dev/null
@@ -1,28 +0,0 @@
----
-
-# this is only here to let the CI tests know
-# that this scenario is using docker
-docker: True
-
-containerized_deployment: True
-ceph_origin: repository
-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
-journal_size: 100
-osd_objectstore: "bluestore"
-crush_device_class: test
-osd_scenario: lvm
-copy_admin_key: true
-devices:
-  - /dev/sdb
-  - /dev/sdc
-os_tuning_params:
-  - { name: fs.file-max, value: 26234859 }
-ceph_conf_overrides:
-  global:
-    osd_pool_default_size: 1
-ceph_osd_docker_run_script_path: /var/tmp
\ No newline at end of file
diff --git a/tests/functional/centos/7/lvm-batch-container/hosts b/tests/functional/centos/7/lvm-batch-container/hosts
deleted file mode 100644 (file)
index f6a265a..0000000
+++ /dev/null
@@ -1,5 +0,0 @@
-[mons]
-mon0
-
-[osds]
-osd0
diff --git a/tests/functional/centos/7/lvm-batch-container/vagrant_variables.yml b/tests/functional/centos/7/lvm-batch-container/vagrant_variables.yml
deleted file mode 100644 (file)
index bd83094..0000000
+++ /dev/null
@@ -1,73 +0,0 @@
----
-
-# DEPLOY CONTAINERIZED DAEMONS
-docker: true
-
-# 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
-mgr_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.39
-cluster_subnet: 192.168.40
-
-# 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/atomic-host
-#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: /vagrant
-# 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: fs.file-max, value: 26234859 }
diff --git a/tests/functional/centos/7/lvm-batch/container/Vagrantfile b/tests/functional/centos/7/lvm-batch/container/Vagrantfile
new file mode 120000 (symlink)
index 0000000..9797e1c
--- /dev/null
@@ -0,0 +1 @@
+../../../../../../Vagrantfile
\ No newline at end of file
diff --git a/tests/functional/centos/7/lvm-batch/container/ceph-override.json b/tests/functional/centos/7/lvm-batch/container/ceph-override.json
new file mode 100644 (file)
index 0000000..1a9600a
--- /dev/null
@@ -0,0 +1,9 @@
+{
+       "ceph_conf_overrides": {
+               "global": {
+                       "osd_pool_default_pg_num": 12,
+                       "osd_pool_default_size": 1
+               }
+       },
+  "ceph_mon_docker_memory_limit": "2g"
+}
diff --git a/tests/functional/centos/7/lvm-batch/container/group_vars/all b/tests/functional/centos/7/lvm-batch/container/group_vars/all
new file mode 100644 (file)
index 0000000..6ed0bec
--- /dev/null
@@ -0,0 +1,28 @@
+---
+
+# this is only here to let the CI tests know
+# that this scenario is using docker
+docker: True
+
+containerized_deployment: True
+ceph_origin: repository
+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
+journal_size: 100
+osd_objectstore: "bluestore"
+crush_device_class: test
+osd_scenario: lvm
+copy_admin_key: true
+devices:
+  - /dev/sdb
+  - /dev/sdc
+os_tuning_params:
+  - { name: fs.file-max, value: 26234859 }
+ceph_conf_overrides:
+  global:
+    osd_pool_default_size: 1
+ceph_osd_docker_run_script_path: /var/tmp
\ No newline at end of file
diff --git a/tests/functional/centos/7/lvm-batch/container/hosts b/tests/functional/centos/7/lvm-batch/container/hosts
new file mode 100644 (file)
index 0000000..f6a265a
--- /dev/null
@@ -0,0 +1,5 @@
+[mons]
+mon0
+
+[osds]
+osd0
diff --git a/tests/functional/centos/7/lvm-batch/container/vagrant_variables.yml b/tests/functional/centos/7/lvm-batch/container/vagrant_variables.yml
new file mode 100644 (file)
index 0000000..bd83094
--- /dev/null
@@ -0,0 +1,73 @@
+---
+
+# DEPLOY CONTAINERIZED DAEMONS
+docker: true
+
+# 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
+mgr_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.39
+cluster_subnet: 192.168.40
+
+# 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/atomic-host
+#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: /vagrant
+# 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: fs.file-max, value: 26234859 }
diff --git a/tests/functional/centos/7/lvm-osds-container/Vagrantfile b/tests/functional/centos/7/lvm-osds-container/Vagrantfile
deleted file mode 120000 (symlink)
index dfd7436..0000000
+++ /dev/null
@@ -1 +0,0 @@
-../../../../../Vagrantfile
\ No newline at end of file
diff --git a/tests/functional/centos/7/lvm-osds-container/ceph-override.json b/tests/functional/centos/7/lvm-osds-container/ceph-override.json
deleted file mode 120000 (symlink)
index 775cb00..0000000
+++ /dev/null
@@ -1 +0,0 @@
-../cluster/ceph-override.json
\ No newline at end of file
diff --git a/tests/functional/centos/7/lvm-osds-container/group_vars/all b/tests/functional/centos/7/lvm-osds-container/group_vars/all
deleted file mode 100644 (file)
index 45e2df8..0000000
+++ /dev/null
@@ -1,32 +0,0 @@
----
-
-# this is only here to let the CI tests know
-# that this scenario is using docker
-docker: True
-
-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
-journal_size: 100
-osd_objectstore: "filestore"
-copy_admin_key: true
-containerized_deployment: true
-# test-volume is created by tests/functional/lvm_setup.yml from /dev/sdb
-osd_scenario: lvm
-lvm_volumes:
-  - data: data-lv1
-    journal: /dev/sdc1
-    data_vg: test_group
-  - data: data-lv2
-    journal: journal1
-    data_vg: test_group
-    journal_vg: journals
-os_tuning_params:
-  - { name: fs.file-max, value: 26234859 }
-ceph_conf_overrides:
-  global:
-    osd_pool_default_size: 1
-ceph_osd_docker_run_script_path: /var/tmp
\ No newline at end of file
diff --git a/tests/functional/centos/7/lvm-osds-container/hosts b/tests/functional/centos/7/lvm-osds-container/hosts
deleted file mode 100644 (file)
index f6a265a..0000000
+++ /dev/null
@@ -1,5 +0,0 @@
-[mons]
-mon0
-
-[osds]
-osd0
diff --git a/tests/functional/centos/7/lvm-osds-container/vagrant_variables.yml b/tests/functional/centos/7/lvm-osds-container/vagrant_variables.yml
deleted file mode 100644 (file)
index bd83094..0000000
+++ /dev/null
@@ -1,73 +0,0 @@
----
-
-# DEPLOY CONTAINERIZED DAEMONS
-docker: true
-
-# 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
-mgr_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.39
-cluster_subnet: 192.168.40
-
-# 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/atomic-host
-#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: /vagrant
-# 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: fs.file-max, value: 26234859 }
diff --git a/tests/functional/centos/7/lvm-osds/container/Vagrantfile b/tests/functional/centos/7/lvm-osds/container/Vagrantfile
new file mode 120000 (symlink)
index 0000000..9797e1c
--- /dev/null
@@ -0,0 +1 @@
+../../../../../../Vagrantfile
\ No newline at end of file
diff --git a/tests/functional/centos/7/lvm-osds/container/ceph-override.json b/tests/functional/centos/7/lvm-osds/container/ceph-override.json
new file mode 120000 (symlink)
index 0000000..24aaedd
--- /dev/null
@@ -0,0 +1 @@
+../../cluster/ceph-override.json
\ No newline at end of file
diff --git a/tests/functional/centos/7/lvm-osds/container/group_vars/all b/tests/functional/centos/7/lvm-osds/container/group_vars/all
new file mode 100644 (file)
index 0000000..45e2df8
--- /dev/null
@@ -0,0 +1,32 @@
+---
+
+# this is only here to let the CI tests know
+# that this scenario is using docker
+docker: True
+
+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
+journal_size: 100
+osd_objectstore: "filestore"
+copy_admin_key: true
+containerized_deployment: true
+# test-volume is created by tests/functional/lvm_setup.yml from /dev/sdb
+osd_scenario: lvm
+lvm_volumes:
+  - data: data-lv1
+    journal: /dev/sdc1
+    data_vg: test_group
+  - data: data-lv2
+    journal: journal1
+    data_vg: test_group
+    journal_vg: journals
+os_tuning_params:
+  - { name: fs.file-max, value: 26234859 }
+ceph_conf_overrides:
+  global:
+    osd_pool_default_size: 1
+ceph_osd_docker_run_script_path: /var/tmp
\ No newline at end of file
diff --git a/tests/functional/centos/7/lvm-osds/container/hosts b/tests/functional/centos/7/lvm-osds/container/hosts
new file mode 100644 (file)
index 0000000..f6a265a
--- /dev/null
@@ -0,0 +1,5 @@
+[mons]
+mon0
+
+[osds]
+osd0
diff --git a/tests/functional/centos/7/lvm-osds/container/vagrant_variables.yml b/tests/functional/centos/7/lvm-osds/container/vagrant_variables.yml
new file mode 100644 (file)
index 0000000..bd83094
--- /dev/null
@@ -0,0 +1,73 @@
+---
+
+# DEPLOY CONTAINERIZED DAEMONS
+docker: true
+
+# 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
+mgr_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.39
+cluster_subnet: 192.168.40
+
+# 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/atomic-host
+#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: /vagrant
+# 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: fs.file-max, value: 26234859 }
diff --git a/tests/functional/centos/7/rgw-multisite-container/Vagrantfile b/tests/functional/centos/7/rgw-multisite-container/Vagrantfile
deleted file mode 120000 (symlink)
index dfd7436..0000000
+++ /dev/null
@@ -1 +0,0 @@
-../../../../../Vagrantfile
\ No newline at end of file
diff --git a/tests/functional/centos/7/rgw-multisite-container/ceph-override.json b/tests/functional/centos/7/rgw-multisite-container/ceph-override.json
deleted file mode 120000 (symlink)
index 775cb00..0000000
+++ /dev/null
@@ -1 +0,0 @@
-../cluster/ceph-override.json
\ No newline at end of file
diff --git a/tests/functional/centos/7/rgw-multisite-container/group_vars/all b/tests/functional/centos/7/rgw-multisite-container/group_vars/all
deleted file mode 100644 (file)
index f5dedff..0000000
+++ /dev/null
@@ -1,24 +0,0 @@
----
-docker: True
-containerized_deployment: true
-ceph_origin: repository
-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
-journal_size: 100
-osd_objectstore: "bluestore"
-osd_scenario: lvm
-copy_admin_key: true
-# test-volume is created by tests/functional/lvm_setup.yml from /dev/sdb
-lvm_volumes:
-  - data: /dev/sda
-  - data: /dev/sdb
-os_tuning_params:
-  - { name: fs.file-max, value: 26234859 }
-ceph_conf_overrides:
-  global:
-    osd_pool_default_size: 1
-ceph_osd_docker_run_script_path: /var/tmp
diff --git a/tests/functional/centos/7/rgw-multisite-container/group_vars/rgws b/tests/functional/centos/7/rgw-multisite-container/group_vars/rgws
deleted file mode 100644 (file)
index 6ecc36f..0000000
+++ /dev/null
@@ -1,19 +0,0 @@
----
-copy_admin_key: true
-# Enable Multisite support
-rgw_multisite: true
-rgw_zone: jupiter
-rgw_zonemaster: true
-rgw_zonesecondary: false
-rgw_zonegroup: solarsystem
-rgw_zone_user: zone.user
-rgw_realm: milkyway
-system_access_key: 6kWkikvapSnHyE22P7nO
-system_secret_key: MGecsMrWtKZgngOHZdrd6d3JxGO5CPWgT2lcnpSt
-rgw_create_pools:
-  foo:
-    pg_num: 17
-  bar:
-    pg_num: 19
-rgw_override_bucket_index_max_shards: 16
-rgw_bucket_default_quota_max_objects: 1638400
\ No newline at end of file
diff --git a/tests/functional/centos/7/rgw-multisite-container/hosts b/tests/functional/centos/7/rgw-multisite-container/hosts
deleted file mode 100644 (file)
index 3901c5a..0000000
+++ /dev/null
@@ -1,8 +0,0 @@
-[mons]
-mon0
-
-[osds]
-osd0
-
-[rgws]
-osd0 rgw_multisite_endpoint_addr=192.168.105.100
diff --git a/tests/functional/centos/7/rgw-multisite-container/secondary/Vagrantfile b/tests/functional/centos/7/rgw-multisite-container/secondary/Vagrantfile
deleted file mode 120000 (symlink)
index 9797e1c..0000000
+++ /dev/null
@@ -1 +0,0 @@
-../../../../../../Vagrantfile
\ No newline at end of file
diff --git a/tests/functional/centos/7/rgw-multisite-container/secondary/group_vars/all b/tests/functional/centos/7/rgw-multisite-container/secondary/group_vars/all
deleted file mode 100644 (file)
index e8a2fa5..0000000
+++ /dev/null
@@ -1,24 +0,0 @@
----
-docker: True
-containerized_deployment: true
-ceph_origin: repository
-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
-journal_size: 100
-osd_objectstore: "bluestore"
-osd_scenario: lvm
-copy_admin_key: true
-# test-volume is created by tests/functional/lvm_setup.yml from /dev/sdb
-lvm_volumes:
-  - data: /dev/sda
-  - data: /dev/sdb
-os_tuning_params:
-  - { name: fs.file-max, value: 26234859 }
-ceph_conf_overrides:
-  global:
-    osd_pool_default_size: 1
-ceph_osd_docker_run_script_path: /var/tmp
\ No newline at end of file
diff --git a/tests/functional/centos/7/rgw-multisite-container/secondary/group_vars/rgws b/tests/functional/centos/7/rgw-multisite-container/secondary/group_vars/rgws
deleted file mode 100644 (file)
index 60860e6..0000000
+++ /dev/null
@@ -1,8 +0,0 @@
----
-rgw_create_pools:
-  foo:
-    pg_num: 17
-  bar:
-    pg_num: 19
-rgw_override_bucket_index_max_shards: 16
-rgw_bucket_default_quota_max_objects: 1638400
\ No newline at end of file
diff --git a/tests/functional/centos/7/rgw-multisite-container/secondary/hosts b/tests/functional/centos/7/rgw-multisite-container/secondary/hosts
deleted file mode 100644 (file)
index e2e0c30..0000000
+++ /dev/null
@@ -1,8 +0,0 @@
-[mons]
-mon0
-
-[osds]
-osd0
-
-[rgws]
-osd0 copy_admin_key=True rgw_multisite=True rgw_zone=mars rgw_zonemaster=False rgw_zonesecondary=True rgw_zonegroup=solarsystem rgw_zone_user=zone.user rgw_realm=milkyway rgw_multisite_endpoint_addr=192.168.107.100 system_access_key=6kWkikvapSnHyE22P7nO system_secret_key=MGecsMrWtKZgngOHZdrd6d3JxGO5CPWgT2lcnpSt rgw_pull_proto=http rgw_pull_port=8080 rgw_pullhost=192.168.105.100
diff --git a/tests/functional/centos/7/rgw-multisite-container/secondary/vagrant_variables.yml b/tests/functional/centos/7/rgw-multisite-container/secondary/vagrant_variables.yml
deleted file mode 100644 (file)
index 74bb861..0000000
+++ /dev/null
@@ -1,73 +0,0 @@
----
-
-# DEPLOY CONTAINERIZED DAEMONS
-docker: true
-
-# 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
-mgr_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.107
-cluster_subnet: 192.168.108
-
-# MEMORY
-# set 1024 for CentOS
-memory: 1024
-
-# 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/atomic-host
-#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: /vagrant
-# 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: fs.file-max, value: 26234859 }
diff --git a/tests/functional/centos/7/rgw-multisite-container/vagrant_variables.yml b/tests/functional/centos/7/rgw-multisite-container/vagrant_variables.yml
deleted file mode 100644 (file)
index 7ac4c64..0000000
+++ /dev/null
@@ -1,73 +0,0 @@
----
-
-# DEPLOY CONTAINERIZED DAEMONS
-docker: true
-
-# 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
-mgr_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.105
-cluster_subnet: 192.168.106
-
-# MEMORY
-# set 1024 for CentOS
-memory: 1024
-
-# 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/atomic-host
-#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: /vagrant
-# 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: fs.file-max, value: 26234859 }
diff --git a/tests/functional/centos/7/rgw-multisite/container/Vagrantfile b/tests/functional/centos/7/rgw-multisite/container/Vagrantfile
new file mode 120000 (symlink)
index 0000000..9797e1c
--- /dev/null
@@ -0,0 +1 @@
+../../../../../../Vagrantfile
\ No newline at end of file
diff --git a/tests/functional/centos/7/rgw-multisite/container/ceph-override.json b/tests/functional/centos/7/rgw-multisite/container/ceph-override.json
new file mode 120000 (symlink)
index 0000000..24aaedd
--- /dev/null
@@ -0,0 +1 @@
+../../cluster/ceph-override.json
\ No newline at end of file
diff --git a/tests/functional/centos/7/rgw-multisite/container/group_vars/all b/tests/functional/centos/7/rgw-multisite/container/group_vars/all
new file mode 100644 (file)
index 0000000..f5dedff
--- /dev/null
@@ -0,0 +1,24 @@
+---
+docker: True
+containerized_deployment: true
+ceph_origin: repository
+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
+journal_size: 100
+osd_objectstore: "bluestore"
+osd_scenario: lvm
+copy_admin_key: true
+# test-volume is created by tests/functional/lvm_setup.yml from /dev/sdb
+lvm_volumes:
+  - data: /dev/sda
+  - data: /dev/sdb
+os_tuning_params:
+  - { name: fs.file-max, value: 26234859 }
+ceph_conf_overrides:
+  global:
+    osd_pool_default_size: 1
+ceph_osd_docker_run_script_path: /var/tmp
diff --git a/tests/functional/centos/7/rgw-multisite/container/group_vars/rgws b/tests/functional/centos/7/rgw-multisite/container/group_vars/rgws
new file mode 100644 (file)
index 0000000..6ecc36f
--- /dev/null
@@ -0,0 +1,19 @@
+---
+copy_admin_key: true
+# Enable Multisite support
+rgw_multisite: true
+rgw_zone: jupiter
+rgw_zonemaster: true
+rgw_zonesecondary: false
+rgw_zonegroup: solarsystem
+rgw_zone_user: zone.user
+rgw_realm: milkyway
+system_access_key: 6kWkikvapSnHyE22P7nO
+system_secret_key: MGecsMrWtKZgngOHZdrd6d3JxGO5CPWgT2lcnpSt
+rgw_create_pools:
+  foo:
+    pg_num: 17
+  bar:
+    pg_num: 19
+rgw_override_bucket_index_max_shards: 16
+rgw_bucket_default_quota_max_objects: 1638400
\ No newline at end of file
diff --git a/tests/functional/centos/7/rgw-multisite/container/hosts b/tests/functional/centos/7/rgw-multisite/container/hosts
new file mode 100644 (file)
index 0000000..3901c5a
--- /dev/null
@@ -0,0 +1,8 @@
+[mons]
+mon0
+
+[osds]
+osd0
+
+[rgws]
+osd0 rgw_multisite_endpoint_addr=192.168.105.100
diff --git a/tests/functional/centos/7/rgw-multisite/container/secondary/Vagrantfile b/tests/functional/centos/7/rgw-multisite/container/secondary/Vagrantfile
new file mode 120000 (symlink)
index 0000000..bb8a193
--- /dev/null
@@ -0,0 +1 @@
+../../../../../../../Vagrantfile
\ No newline at end of file
diff --git a/tests/functional/centos/7/rgw-multisite/container/secondary/group_vars/all b/tests/functional/centos/7/rgw-multisite/container/secondary/group_vars/all
new file mode 100644 (file)
index 0000000..e8a2fa5
--- /dev/null
@@ -0,0 +1,24 @@
+---
+docker: True
+containerized_deployment: true
+ceph_origin: repository
+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
+journal_size: 100
+osd_objectstore: "bluestore"
+osd_scenario: lvm
+copy_admin_key: true
+# test-volume is created by tests/functional/lvm_setup.yml from /dev/sdb
+lvm_volumes:
+  - data: /dev/sda
+  - data: /dev/sdb
+os_tuning_params:
+  - { name: fs.file-max, value: 26234859 }
+ceph_conf_overrides:
+  global:
+    osd_pool_default_size: 1
+ceph_osd_docker_run_script_path: /var/tmp
\ No newline at end of file
diff --git a/tests/functional/centos/7/rgw-multisite/container/secondary/group_vars/rgws b/tests/functional/centos/7/rgw-multisite/container/secondary/group_vars/rgws
new file mode 100644 (file)
index 0000000..60860e6
--- /dev/null
@@ -0,0 +1,8 @@
+---
+rgw_create_pools:
+  foo:
+    pg_num: 17
+  bar:
+    pg_num: 19
+rgw_override_bucket_index_max_shards: 16
+rgw_bucket_default_quota_max_objects: 1638400
\ No newline at end of file
diff --git a/tests/functional/centos/7/rgw-multisite/container/secondary/hosts b/tests/functional/centos/7/rgw-multisite/container/secondary/hosts
new file mode 100644 (file)
index 0000000..e2e0c30
--- /dev/null
@@ -0,0 +1,8 @@
+[mons]
+mon0
+
+[osds]
+osd0
+
+[rgws]
+osd0 copy_admin_key=True rgw_multisite=True rgw_zone=mars rgw_zonemaster=False rgw_zonesecondary=True rgw_zonegroup=solarsystem rgw_zone_user=zone.user rgw_realm=milkyway rgw_multisite_endpoint_addr=192.168.107.100 system_access_key=6kWkikvapSnHyE22P7nO system_secret_key=MGecsMrWtKZgngOHZdrd6d3JxGO5CPWgT2lcnpSt rgw_pull_proto=http rgw_pull_port=8080 rgw_pullhost=192.168.105.100
diff --git a/tests/functional/centos/7/rgw-multisite/container/secondary/vagrant_variables.yml b/tests/functional/centos/7/rgw-multisite/container/secondary/vagrant_variables.yml
new file mode 100644 (file)
index 0000000..74bb861
--- /dev/null
@@ -0,0 +1,73 @@
+---
+
+# DEPLOY CONTAINERIZED DAEMONS
+docker: true
+
+# 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
+mgr_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.107
+cluster_subnet: 192.168.108
+
+# MEMORY
+# set 1024 for CentOS
+memory: 1024
+
+# 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/atomic-host
+#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: /vagrant
+# 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: fs.file-max, value: 26234859 }
diff --git a/tests/functional/centos/7/rgw-multisite/container/vagrant_variables.yml b/tests/functional/centos/7/rgw-multisite/container/vagrant_variables.yml
new file mode 100644 (file)
index 0000000..7ac4c64
--- /dev/null
@@ -0,0 +1,73 @@
+---
+
+# DEPLOY CONTAINERIZED DAEMONS
+docker: true
+
+# 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
+mgr_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.105
+cluster_subnet: 192.168.106
+
+# MEMORY
+# set 1024 for CentOS
+memory: 1024
+
+# 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/atomic-host
+#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: /vagrant
+# 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: fs.file-max, value: 26234859 }
diff --git a/tests/functional/centos/7/shrink_osd/container/Vagrantfile b/tests/functional/centos/7/shrink_osd/container/Vagrantfile
new file mode 120000 (symlink)
index 0000000..9797e1c
--- /dev/null
@@ -0,0 +1 @@
+../../../../../../Vagrantfile
\ No newline at end of file
diff --git a/tests/functional/centos/7/shrink_osd/container/ceph-override.json b/tests/functional/centos/7/shrink_osd/container/ceph-override.json
new file mode 120000 (symlink)
index 0000000..24aaedd
--- /dev/null
@@ -0,0 +1 @@
+../../cluster/ceph-override.json
\ No newline at end of file
diff --git a/tests/functional/centos/7/shrink_osd/container/group_vars/all b/tests/functional/centos/7/shrink_osd/container/group_vars/all
new file mode 100644 (file)
index 0000000..a4806c2
--- /dev/null
@@ -0,0 +1,15 @@
+---
+# this is only here to let the CI tests know
+# that this scenario is using docker
+docker: True
+
+containerized_deployment: True
+monitor_interface: eth1
+ceph_mon_docker_subnet: "{{ public_network }}"
+ceph_docker_on_openstack: False
+public_network: "192.168.73.0/24"
+cluster_network: "192.168.74.0/24"
+ceph_conf_overrides:
+  global:
+    osd_pool_default_size: 1
+openstack_config: False
diff --git a/tests/functional/centos/7/shrink_osd/container/group_vars/osds b/tests/functional/centos/7/shrink_osd/container/group_vars/osds
new file mode 100644 (file)
index 0000000..7a4bf92
--- /dev/null
@@ -0,0 +1,13 @@
+---
+ceph_osd_docker_run_script_path: /var/tmp
+journal_size: 100
+osd_objectstore: "filestore"
+osd_scenario: lvm
+lvm_volumes:
+  - data: data-lv1
+    journal: /dev/sdc1
+    data_vg: test_group
+  - data: data-lv2
+    journal: journal1
+    data_vg: test_group
+    journal_vg: journals
diff --git a/tests/functional/centos/7/shrink_osd/container/hosts b/tests/functional/centos/7/shrink_osd/container/hosts
new file mode 100644 (file)
index 0000000..458c66a
--- /dev/null
@@ -0,0 +1,7 @@
+[mons]
+mon0
+
+[osds]
+osd0
+osd1
+osd2
diff --git a/tests/functional/centos/7/shrink_osd/container/vagrant_variables.yml b/tests/functional/centos/7/shrink_osd/container/vagrant_variables.yml
new file mode 100644 (file)
index 0000000..bfce4cc
--- /dev/null
@@ -0,0 +1,60 @@
+---
+
+# DEPLOY CONTAINERIZED DAEMONS
+docker: True
+
+# DEFINE THE NUMBER OF VMS TO RUN
+mon_vms: 1
+osd_vms: 3
+mds_vms: 0
+rgw_vms: 0
+nfs_vms: 0
+rbd_mirror_vms: 0
+client_vms: 0
+iscsi_gw_vms: 0
+mgr_vms: 0
+
+# SUBNETS TO USE FOR THE VMS
+public_subnet: 192.168.73
+cluster_subnet: 192.168.74
+
+# MEMORY
+# set 1024 for CentOS
+memory: 1024
+
+# Disks
+# For libvirt use disks: "[ '/dev/vdb', '/dev/vdc' ]"
+# For CentOS7 use disks: "[ '/dev/sda', '/dev/sdb' ]"
+disks: "[ '/dev/sda', '/dev/sdb' ]"
+
+# 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/atomic-host
+#client_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: /vagrant
+# 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
diff --git a/tests/functional/centos/7/shrink_osd_container/Vagrantfile b/tests/functional/centos/7/shrink_osd_container/Vagrantfile
deleted file mode 120000 (symlink)
index dfd7436..0000000
+++ /dev/null
@@ -1 +0,0 @@
-../../../../../Vagrantfile
\ No newline at end of file
diff --git a/tests/functional/centos/7/shrink_osd_container/ceph-override.json b/tests/functional/centos/7/shrink_osd_container/ceph-override.json
deleted file mode 120000 (symlink)
index 775cb00..0000000
+++ /dev/null
@@ -1 +0,0 @@
-../cluster/ceph-override.json
\ No newline at end of file
diff --git a/tests/functional/centos/7/shrink_osd_container/group_vars/all b/tests/functional/centos/7/shrink_osd_container/group_vars/all
deleted file mode 100644 (file)
index a4806c2..0000000
+++ /dev/null
@@ -1,15 +0,0 @@
----
-# this is only here to let the CI tests know
-# that this scenario is using docker
-docker: True
-
-containerized_deployment: True
-monitor_interface: eth1
-ceph_mon_docker_subnet: "{{ public_network }}"
-ceph_docker_on_openstack: False
-public_network: "192.168.73.0/24"
-cluster_network: "192.168.74.0/24"
-ceph_conf_overrides:
-  global:
-    osd_pool_default_size: 1
-openstack_config: False
diff --git a/tests/functional/centos/7/shrink_osd_container/group_vars/osds b/tests/functional/centos/7/shrink_osd_container/group_vars/osds
deleted file mode 100644 (file)
index 7a4bf92..0000000
+++ /dev/null
@@ -1,13 +0,0 @@
----
-ceph_osd_docker_run_script_path: /var/tmp
-journal_size: 100
-osd_objectstore: "filestore"
-osd_scenario: lvm
-lvm_volumes:
-  - data: data-lv1
-    journal: /dev/sdc1
-    data_vg: test_group
-  - data: data-lv2
-    journal: journal1
-    data_vg: test_group
-    journal_vg: journals
diff --git a/tests/functional/centos/7/shrink_osd_container/hosts b/tests/functional/centos/7/shrink_osd_container/hosts
deleted file mode 100644 (file)
index 458c66a..0000000
+++ /dev/null
@@ -1,7 +0,0 @@
-[mons]
-mon0
-
-[osds]
-osd0
-osd1
-osd2
diff --git a/tests/functional/centos/7/shrink_osd_container/vagrant_variables.yml b/tests/functional/centos/7/shrink_osd_container/vagrant_variables.yml
deleted file mode 100644 (file)
index bfce4cc..0000000
+++ /dev/null
@@ -1,60 +0,0 @@
----
-
-# DEPLOY CONTAINERIZED DAEMONS
-docker: True
-
-# DEFINE THE NUMBER OF VMS TO RUN
-mon_vms: 1
-osd_vms: 3
-mds_vms: 0
-rgw_vms: 0
-nfs_vms: 0
-rbd_mirror_vms: 0
-client_vms: 0
-iscsi_gw_vms: 0
-mgr_vms: 0
-
-# SUBNETS TO USE FOR THE VMS
-public_subnet: 192.168.73
-cluster_subnet: 192.168.74
-
-# MEMORY
-# set 1024 for CentOS
-memory: 1024
-
-# Disks
-# For libvirt use disks: "[ '/dev/vdb', '/dev/vdc' ]"
-# For CentOS7 use disks: "[ '/dev/sda', '/dev/sdb' ]"
-disks: "[ '/dev/sda', '/dev/sdb' ]"
-
-# 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/atomic-host
-#client_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: /vagrant
-# 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
diff --git a/tox.ini b/tox.ini
index cebda99cf7d8f27a1f95f9f2c56e8de68b71d080..c03b499d51c43d32f2fc49dde11a42280d9d8be7 100644 (file)
--- a/tox.ini
+++ b/tox.ini
@@ -1,5 +1,6 @@
 [tox]
-envlist = {dev,rhcs}-{xenial_cluster,centos7_cluster,cluster,docker_cluster,update_cluster,update_docker_cluster,switch_to_containers,ooo_collocation,bluestore_lvm_osds,bluestore_lvm_osds_container,lvm_osds,shrink_mon,shrink_osd,shrink_mon_container,shrink_osd_container,docker_cluster_collocation,lvm_batch,lvm_osds_container,lvm_batch_container,infra_lv_create,add_osds,add_osds_container,rgw_multisite,rgw_multisite_container,container_podman,storage_inventory,storage_inventory_container}
+envlist = {dev,rhcs}-{container,non_container}-{xenial_cluster,centos7,update,bluestore_lvm_osds,lvm_osds,shrink_mon,shrink_osd,lvm_batch,add_osds,rgw_multisite,purge_cluster,storage_inventory}
+  {dev,rhcs}-{switch_to_containers,cluster,ooo_collocation,docker_cluster_collocation,infra_lv_create,container_podman}
   infra_lv_create
 
 skipsdist = True
@@ -87,7 +88,7 @@ commands=
 
   # set up the cluster again
   ansible-playbook -vv -i {changedir}/hosts {toxinidir}/{env:PLAYBOOK:site.yml.sample} --extra-vars "\
-      ceph_stable_release={env:CEPH_STABLE_RELEASE:luminous} \
+      ceph_stable_release={env:CEPH_STABLE_RELEASE:nautilus} \
       fetch_directory={env:FETCH_DIRECTORY:{changedir}/fetch} \
       ceph_docker_registry={env:CEPH_DOCKER_REGISTRY:docker.io} \
       ceph_docker_image={env:CEPH_DOCKER_IMAGE:ceph/daemon} \
@@ -156,7 +157,7 @@ commands=
   ansible-playbook -vv -i {changedir}/hosts-2 --limit osd1 {toxinidir}/add-osd.yml --extra-vars "\
       ireallymeanit=yes \
       fetch_directory={env:FETCH_DIRECTORY:{changedir}/fetch} \
-      ceph_stable_release={env:CEPH_STABLE_RELEASE:mimic} \
+      ceph_stable_release={env:CEPH_STABLE_RELEASE:nautilus} \
       ceph_docker_registry={env:CEPH_DOCKER_REGISTRY:docker.io} \
       ceph_docker_image={env:CEPH_DOCKER_IMAGE:ceph/daemon} \
       ceph_docker_image_tag={env:CEPH_DOCKER_IMAGE_TAG:latest-master} \
@@ -212,45 +213,26 @@ setenv=
   ANSIBLE_CALLBACK_WHITELIST = profile_tasks
   # only available for ansible >= 2.5
   ANSIBLE_STDOUT_CALLBACK = yaml
-  ansible2.2: DELEGATE_FACTS_HOST = False
-  docker_cluster: PLAYBOOK = site-docker.yml.sample
-  docker_cluster_collocation: PLAYBOOK = site-docker.yml.sample
-  ooo_collocation: PLAYBOOK = site-docker.yml.sample
-  update_docker_cluster: PLAYBOOK = site-docker.yml.sample
-  purge_cluster_container: PLAYBOOK = site-docker.yml.sample
-  purge_cluster_container: PURGE_PLAYBOOK = purge-docker-cluster.yml
-  add_osds: PLAYBOOK = site.yml.sample
-  add_osds_container: PLAYBOOK = site-docker.yml.sample
-  rgw_multisite: PLAYBOOK = site.yml.sample
-  rgw_multisite_container: PLAYBOOK = site-docker.yml.sample
-  shrink_mon_container: PLAYBOOK = site-docker.yml.sample
-  shrink_mon_container: MON_TO_KILL = mon2
-  shrink_osd_container: PLAYBOOK = site-docker.yml.sample
-  shrink_osd_container: COPY_ADMIN_KEY = True
-  shrink_osd: COPY_ADMIN_KEY = True
+  container: CONTAINER_DIR = /container
+  container: PLAYBOOK = site-docker.yml.sample
   container_podman: PLAYBOOK = site-docker.yml.sample
   storage_inventory: COPY_ADMIN_KEY = True
-  storage_inventory_container: PLAYBOOK = site-docker.yml.sample
+  non_container: PLAYBOOK = site.yml.sample
+  container-purge_cluster: PURGE_PLAYBOOK = purge-docker-cluster.yml
+  shrink_mon: MON_TO_KILL = mon2
+  shrink_osd: COPY_ADMIN_KEY = True
 
   rhcs: CEPH_STABLE_RELEASE = luminous
   lvm_osds: CEPH_STABLE_RELEASE = luminous
-  lvm_osds: PLAYBOOK = site.yml.sample
-  lvm_osds_container: PLAYBOOK = site-docker.yml.sample
-  bluestore_lvm_osds_container: PLAYBOOK = site-docker.yml.sample
-  lvm_batch_container: PLAYBOOK = site-docker.yml.sample
 
   rhcs: CEPH_STABLE_RELEASE = luminous
   dev: CEPH_DOCKER_IMAGE_TAG = latest-master
-  dev: CEPH_DOCKER_IMAGE_TAG_BIS = latest-bis
-  dev: UPDATE_CEPH_DOCKER_IMAGE_TAG = latest
+  dev: CEPH_DOCKER_IMAGE_TAG_BIS = latest-bis-master
+  dev: UPDATE_CEPH_DOCKER_IMAGE_TAG = latest-master
   dev: UPDATE_CEPH_DEV_BRANCH = master
   dev: UPDATE_CEPH_DEV_SHA1 = latest
+  dev: CEPH_STABLE_RELEASE = mimic
   update_cluster: ROLLING_UPDATE = True
-  update_cluster: CEPH_STABLE_RELEASE = mimic
-  update_docker_cluster: ROLLING_UPDATE = True
-  update_docker_cluster: CEPH_STABLE_RELEASE = mimic
-  update_docker_cluster: CEPH_DOCKER_IMAGE_TAG = latest-mimic
-  update_docker_cluster: UPDATE_CEPH_DOCKER_IMAGE_TAG = latest
 
   ooo_collocation: CEPH_DOCKER_IMAGE_TAG = v3.0.3-stable-3.0-luminous-centos-7-x86_64
 deps= -r{toxinidir}/tests/requirements.txt
@@ -258,39 +240,27 @@ changedir=
   # tests a 1 mon, 1 osd, 1 mds and 1 rgw xenial cluster using non-collocated OSD scenario
   xenial_cluster: {toxinidir}/tests/functional/ubuntu/16.04/cluster
   # tests a 1 mon, 1 osd, 1 mds and 1 rgw centos7 cluster using non-collocated OSD scenario
-  centos7_cluster: {toxinidir}/tests/functional/centos/7/cluster
-  shrink_mon: {toxinidir}/tests/functional/centos/7/cluster
-  shrink_mon_container: {toxinidir}/tests/functional/centos/7/docker
-  shrink_osd: {toxinidir}/tests/functional/centos/7/shrink_osd
-  shrink_osd_container: {toxinidir}/tests/functional/centos/7/shrink_osd_container
-  # an alias for centos7_cluster, this makes the name better suited for rhcs testing
-  cluster: {toxinidir}/tests/functional/centos/7/cluster
+  cluster: {toxinidir}/tests/functional/centos/7/cluster{env:CONTAINER_DIR:}
+  shrink_mon: {toxinidir}/tests/functional/centos/7/cluster{env:CONTAINER_DIR:}
+  shrink_osd: {toxinidir}/tests/functional/centos/7/shrink_osd{env:CONTAINER_DIR:}
   # tests a 1 mon, 1 osd, 1 mds and 1 rgw centos7 cluster using docker
-  docker_cluster: {toxinidir}/tests/functional/centos/7/docker
-  docker_cluster_collocation: {toxinidir}/tests/functional/centos/7/docker-collocation
-  update_docker_cluster: {toxinidir}/tests/functional/centos/7/docker
-  purge_cluster_non_container: {toxinidir}/tests/functional/centos/7/cluster
-  purge_cluster_container: {toxinidir}/tests/functional/centos/7/docker
-  update_cluster: {toxinidir}/tests/functional/centos/7/cluster
+  cluster_collocation: {toxinidir}/tests/functional/centos/7/docker-collocation
+  update_cluster: {toxinidir}/tests/functional/centos/7/docker{env:CONTAINER_DIR:}
+  purge_cluster: {toxinidir}/tests/functional/centos/7/cluster{env:CONTAINER_DIR:}
   switch_to_containers: {toxinidir}/tests/functional/centos/7/cluster
-  lvm_osds: {toxinidir}/tests/functional/centos/7/lvm-osds
-  lvm_osds_container: {toxinidir}/tests/functional/centos/7/lvm-osds-container
-  lvm_batch: {toxinidir}/tests/functional/centos/7/lvm-batch
-  lvm_batch_container: {toxinidir}/tests/functional/centos/7/lvm-batch-container
-  bluestore_lvm_osds: {toxinidir}/tests/functional/centos/7/bs-lvm-osds
-  bluestore_lvm_osds_container: {toxinidir}/tests/functional/centos/7/bs-lvm-osds-container
+  lvm_osds: {toxinidir}/tests/functional/centos/7/lvm-osds{env:CONTAINER_DIR:}
+  lvm_batch: {toxinidir}/tests/functional/centos/7/lvm-batch{env:CONTAINER_DIR:}
+  bluestore_lvm_osds: {toxinidir}/tests/functional/centos/7/bs-lvm-osds{env:CONTAINER_DIR:}
   ooo_collocation: {toxinidir}/tests/functional/centos/7/ooo-collocation
-  add_osds: {toxinidir}/tests/functional/centos/7/add-osds
-  add_osds_container: {toxinidir}/tests/functional/centos/7/add-osds-container
-  rgw_multisite: {toxinidir}/tests/functional/centos/7/rgw-multisite
-  rgw_multisite_container: {toxinidir}/tests/functional/centos/7/rgw-multisite-container
+  add_osds: {toxinidir}/tests/functional/centos/7/add-osds{env:CONTAINER_DIR:}
+  rgw_multisite: {toxinidir}/tests/functional/centos/7/rgw-multisite{env:CONTAINER_DIR:}
   container_podman: {toxinidir}/tests/functional/fedora/29/container-podman
   storage_inventory: {toxinidir}/tests/functional/centos/7/lvm-osds
   storage_inventory_container: {toxinidir}/tests/functional/centos/7/lvm-osds-container
 
 commands=
   rhcs: ansible-playbook -vv -i "localhost," -c local {toxinidir}/tests/functional/rhcs_setup.yml --extra-vars "change_dir={changedir}" --tags "vagrant_setup"
-  !update_cluster: ansible-playbook -vv -i "localhost," -c local {toxinidir}/tests/functional/dev_setup.yml --extra-vars "change_dir={changedir} ceph_dev_branch={env:CEPH_DEV_BRANCH:master} ceph_dev_sha1={env:CEPH_DEV_SHA1:latest}" --tags "vagrant_setup"
+  !container,update_cluster: ansible-playbook -vv -i "localhost," -c local {toxinidir}/tests/functional/dev_setup.yml --extra-vars "change_dir={changedir} ceph_dev_branch={env:CEPH_DEV_BRANCH:master} ceph_dev_sha1={env:CEPH_DEV_SHA1:latest}" --tags "vagrant_setup"
 
   vagrant up --no-provision {posargs:--provider=virtualbox}
   bash {toxinidir}/tests/scripts/generate_ssh_config.sh {changedir}
@@ -336,29 +306,22 @@ commands=
       --extra-vars "\
       delegate_facts_host={env:DELEGATE_FACTS_HOST:True} \
       fetch_directory={env:FETCH_DIRECTORY:{changedir}/fetch} \
-      ceph_stable_release={env:CEPH_STABLE_RELEASE:mimic} \
+      ceph_stable_release={env:CEPH_STABLE_RELEASE:nautilus} \
       ceph_docker_registry={env:CEPH_DOCKER_REGISTRY:docker.io} \
       ceph_docker_image={env:CEPH_DOCKER_IMAGE:ceph/daemon} \
-      ceph_docker_image_tag={env:CEPH_DOCKER_IMAGE_TAG_BIS:latest-master} # not ideal but what can we do? \
+      ceph_docker_image_tag={env:CEPH_DOCKER_IMAGE_TAG_BIS:latest-bis-master} # not ideal but what can we do? \
       ceph_dev_branch={env:CEPH_DEV_BRANCH:master} \
       ceph_dev_sha1={env:CEPH_DEV_SHA1:latest} \
       copy_admin_key={env:COPY_ADMIN_KEY:False} " \
       --extra-vars @ceph-override.json
 
-  purge_cluster_non_container: {[purge]commands}
-  purge_cluster_container: {[purge]commands}
+  purge_cluster: {[purge]commands}
   switch_to_containers: {[switch-to-containers]commands}
   update_cluster: {[update]commands}
-  update_docker_cluster: {[update]commands}
   shrink_mon: {[shrink-mon]commands}
-  shrink_mon_container: {[shrink-mon]commands}
   shrink_osd: {[shrink-osd]commands}
-  shrink_osd_container: {[shrink-osd]commands}
   add_osds: {[add-osds]commands}
-  add_osds_container: {[add-osds]commands}
   rgw_multisite: {[rgw-multisite]commands}
-  rgw_multisite_container: {[rgw-multisite]commands}
   storage_inventory: {[storage-inventory]commands}
-  storage_inventory_container: {[storage-inventory]commands}
 
   vagrant destroy --force