test: remove ceph-disk CI tests

Since we are removing the ceph-disk test from the ci in master then
there is no need to have the functionnal tests in master anymore.

Signed-off-by: Sébastien Han <seb@redhat.com>
pull/3186/head
Sébastien Han 2018-10-10 14:55:20 -04:00 committed by Guillaume Abrioux
parent 748342f5b6
commit 2fd7da12bb
33 changed files with 1 additions and 482 deletions

View File

@ -1 +0,0 @@
../../../../../Vagrantfile

View File

@ -1 +0,0 @@
../cluster/ceph-override.json

View File

@ -1,16 +0,0 @@
---
docker: true
containerized_deployment: true
cluster: test
monitor_interface: eth1
public_network: "192.168.35.0/24"
cluster_network: "192.168.36.0/24"
# OSD_FORCE_ZAP is only for Jewel, the function does not exist anymore on Luminous and above
ceph_osd_docker_prepare_env: -e OSD_JOURNAL_SIZE={{ journal_size }} -e OSD_FORCE_ZAP=1
ceph_conf_overrides:
global:
osd_pool_default_size: 1
osd:
bluestore block db size = 67108864
bluestore block wal size = 1048576000

View File

@ -1,2 +0,0 @@
---
copy_admin_key: true

View File

@ -1,3 +0,0 @@
---
os_tuning_params:
- { name: fs.file-max, value: 26234859 }

View File

@ -1,8 +0,0 @@
copy_admin_key: true
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

View File

@ -1,13 +0,0 @@
[mons]
mon0 monitor_address=192.168.35.10
[mgrs]
mon0
[osds]
osd0 osd_scenario="collocated" osd_objectstore="bluestore" devices="['/dev/disk/by-path/pci-0000:00:01.1-ata-1.0', '/dev/sdb']"
osd1 osd_scenario="collocated" osd_objectstore="bluestore" devices="['/dev/disk/by-path/pci-0000:00:01.1-ata-1.0', '/dev/sdb']" dmcrypt=True
osd2 osd_scenario="non-collocated" osd_objectstore="bluestore" devices="['/dev/disk/by-path/pci-0000:00:01.1-ata-1.0', '/dev/sdb']" dedicated_devices="['/dev/sdc', '/dev/sdc']"
osd3 osd_scenario="non-collocated" osd_objectstore="bluestore" devices="['/dev/disk/by-path/pci-0000:00:01.1-ata-1.0', '/dev/sdb']" dedicated_devices="['/dev/sdc', '/dev/sdc']" dmcrypt=True
osd4 osd_scenario="collocated" osd_objectstore="bluestore" osd_auto_discovery=True
osd5 osd_scenario="collocated" osd_objectstore="bluestore" osd_auto_discovery=True dmcrypt=True

View File

@ -1,73 +0,0 @@
---
# DEPLOY CONTAINERIZED DAEMONS
docker: false
# DEFINE THE NUMBER OF VMS TO RUN
mon_vms: 1
osd_vms: 6
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.35
cluster_subnet: 192.168.36
# 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/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 }

View File

@ -1 +0,0 @@
../../../../../Vagrantfile

View File

@ -1 +0,0 @@
../cluster/ceph-override.json

View File

@ -1,14 +0,0 @@
---
ceph_origin: repository
ceph_repository: community
cluster: test
monitor_interface: eth1
public_network: "192.168.45.0/24"
cluster_network: "192.168.46.0/24"
ceph_conf_overrides:
global:
osd_pool_default_size: 1
osd:
bluestore block db size = 67108864
bluestore block wal size = 1048576000

View File

@ -1,2 +0,0 @@
---
copy_admin_key: true

View File

@ -1,3 +0,0 @@
---
os_tuning_params:
- { name: fs.file-max, value: 26234859 }

View File

@ -1,8 +0,0 @@
copy_admin_key: true
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

View File

@ -1,14 +0,0 @@
[mons]
mon0 monitor_address=192.168.45.10
[mgrs]
mon0
[osds]
osd0 osd_scenario="collocated" osd_objectstore="bluestore" devices="['/dev/disk/by-path/pci-0000:00:01.1-ata-1.0', '/dev/sdb']"
osd1 osd_scenario="collocated" osd_objectstore="bluestore" devices="['/dev/disk/by-path/pci-0000:00:01.1-ata-1.0', '/dev/sdb']" dmcrypt=True
osd2 osd_scenario="non-collocated" osd_objectstore="bluestore" devices="['/dev/disk/by-path/pci-0000:00:01.1-ata-1.0', '/dev/sdb']" dedicated_devices="['/dev/sdc', '/dev/sdc']"
osd3 osd_scenario="non-collocated" osd_objectstore="bluestore" devices="['/dev/disk/by-path/pci-0000:00:01.1-ata-1.0', '/dev/sdb']" dedicated_devices="['/dev/sdc', '/dev/sdc']" dmcrypt=True
osd4 osd_scenario="collocated" osd_objectstore="bluestore" osd_auto_discovery=True
osd5 osd_scenario="collocated" osd_objectstore="bluestore" osd_auto_discovery=True dmcrypt=True

View File

@ -1,73 +0,0 @@
---
# DEPLOY CONTAINERIZED DAEMONS
docker: false
# DEFINE THE NUMBER OF VMS TO RUN
mon_vms: 1
osd_vms: 6
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.45
cluster_subnet: 192.168.46
# 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/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 }

View File

@ -1 +0,0 @@
../../../../../Vagrantfile

View File

@ -1 +0,0 @@
../cluster/ceph-override.json

View File

@ -1,16 +0,0 @@
---
docker: true
containerized_deployment: true
cluster: test
monitor_interface: eth1
public_network: "192.168.55.0/24"
cluster_network: "192.168.56.0/24"
# OSD_FORCE_ZAP is only for Jewel, the function does not exist anymore on Luminous and above
ceph_osd_docker_prepare_env: -e OSD_JOURNAL_SIZE={{ journal_size }} -e OSD_FORCE_ZAP=1
ceph_conf_overrides:
global:
osd_pool_default_size: 1
osd:
bluestore block db size = 67108864
bluestore block wal size = 1048576000

View File

@ -1,2 +0,0 @@
---
copy_admin_key: true

View File

@ -1,3 +0,0 @@
---
os_tuning_params:
- { name: fs.file-max, value: 26234859 }

View File

@ -1,8 +0,0 @@
copy_admin_key: true
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

View File

@ -1,13 +0,0 @@
[mons]
mon0 monitor_address=192.168.55.10
[mgrs]
mon0
[osds]
osd0 osd_scenario="collocated" osd_objectstore="filestore" devices="['/dev/disk/by-path/pci-0000:00:01.1-ata-1.0', '/dev/sdb']" journal_size=100
osd1 osd_scenario="collocated" osd_objectstore="filestore" devices="['/dev/disk/by-path/pci-0000:00:01.1-ata-1.0', '/dev/sdb']" journal_size=100 dmcrypt=True
osd2 osd_scenario="non-collocated" osd_objectstore="filestore" devices="['/dev/disk/by-path/pci-0000:00:01.1-ata-1.0', '/dev/sdb']" dedicated_devices="['/dev/sdc', '/dev/sdc']" journal_size=100
osd3 osd_scenario="non-collocated" osd_objectstore="filestore" devices="['/dev/disk/by-path/pci-0000:00:01.1-ata-1.0', '/dev/sdb']" dedicated_devices="['/dev/sdc', '/dev/sdc']" journal_size=100 dmcrypt=True
osd4 osd_scenario="collocated" osd_objectstore="filestore" osd_auto_discovery=True journal_size=100
osd5 osd_scenario="collocated" osd_objectstore="filestore" osd_auto_discovery=True journal_size=100 dmcrypt=True

View File

@ -1,73 +0,0 @@
---
# DEPLOY CONTAINERIZED DAEMONS
docker: false
# DEFINE THE NUMBER OF VMS TO RUN
mon_vms: 1
osd_vms: 6
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.55
cluster_subnet: 192.168.56
# 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/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 }

View File

@ -1 +0,0 @@
../../../../../Vagrantfile

View File

@ -1 +0,0 @@
../cluster/ceph-override.json

View File

@ -1,14 +0,0 @@
---
ceph_origin: repository
ceph_repository: community
cluster: test
monitor_interface: eth1
public_network: "192.168.65.0/24"
cluster_network: "192.168.66.0/24"
ceph_conf_overrides:
global:
osd_pool_default_size: 1
osd:
bluestore block db size = 67108864
bluestore block wal size = 1048576000

View File

@ -1,2 +0,0 @@
---
copy_admin_key: true

View File

@ -1,3 +0,0 @@
---
os_tuning_params:
- { name: fs.file-max, value: 26234859 }

View File

@ -1,8 +0,0 @@
copy_admin_key: true
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

View File

@ -1,13 +0,0 @@
[mons]
mon0 monitor_address=192.168.65.10
[mgrs]
mon0
[osds]
osd0 osd_scenario="collocated" osd_objectstore="filestore" devices="['/dev/disk/by-path/pci-0000:00:01.1-ata-1.0', '/dev/sdb']" journal_size=100
osd1 osd_scenario="collocated" osd_objectstore="filestore" devices="['/dev/disk/by-path/pci-0000:00:01.1-ata-1.0', '/dev/sdb']" journal_size=100 dmcrypt=True
osd2 osd_scenario="non-collocated" osd_objectstore="filestore" devices="['/dev/disk/by-path/pci-0000:00:01.1-ata-1.0', '/dev/sdb']" dedicated_devices="['/dev/sdc', '/dev/sdc']" journal_size=100
osd3 osd_scenario="non-collocated" osd_objectstore="filestore" devices="['/dev/disk/by-path/pci-0000:00:01.1-ata-1.0', '/dev/sdb']" dedicated_devices="['/dev/sdc', '/dev/sdc']" journal_size=100 dmcrypt=True
osd4 osd_scenario="collocated" osd_objectstore="filestore" osd_auto_discovery=True journal_size=100
osd5 osd_scenario="collocated" osd_objectstore="filestore" osd_auto_discovery=True journal_size=100 dmcrypt=True

View File

@ -1,73 +0,0 @@
---
# DEPLOY CONTAINERIZED DAEMONS
docker: false
# DEFINE THE NUMBER OF VMS TO RUN
mon_vms: 1
osd_vms: 6
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.65
cluster_subnet: 192.168.66
# 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/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 }

18
tox.ini
View File

@ -1,6 +1,5 @@
[tox]
envlist = {dev,luminous,mimic,rhcs}-{xenial_cluster,centos7_cluster,docker_cluster,update_cluster,cluster,update_docker_cluster,switch_to_containers,purge_filestore_osds_container,purge_filestore_osds_non_container,purge_cluster_non_container,purge_cluster_container,ooo_collocation,filestore_osds_non_container,filestore_osds_container,bluestore_osds_container,bluestore_osds_non_container,bluestore_lvm_osds,lvm_osds,purge_lvm_osds,shrink_mon,shrink_osd,shrink_mon_container,shrink_osd_container,docker_cluster_collocation,purge_bluestore_osds_non_container,purge_bluestore_osds_container,lvm_batch,add_osds,add_osds_container}
infra_lv_create
envlist = {dev,luminous,mimic,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,purge_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}
skipsdist = True
@ -185,15 +184,8 @@ setenv=
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
purge_bluestore_osds_container: PLAYBOOK = site-docker.yml.sample
purge_bluestore_osds_container: PURGE_PLAYBOOK = purge-docker-cluster.yml
purge_filestore_osds_container: PLAYBOOK = site-docker.yml.sample
purge_filestore_osds_container: PURGE_PLAYBOOK = purge-docker-cluster.yml
add_osds: PLAYBOOK = site.yml.sample
add_osds_container: PLAYBOOK = site-docker.yml.sample
filestore_osds_container: PLAYBOOK = site-docker.yml.sample
bluestore_osds_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
@ -230,10 +222,6 @@ changedir=
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
filestore_osds_container: {toxinidir}/tests/functional/centos/7/fs-osds-container
bluestore_osds_container: {toxinidir}/tests/functional/centos/7/bs-osds-container
filestore_osds_non_container: {toxinidir}/tests/functional/centos/7/fs-osds-non-container
bluestore_osds_non_container: {toxinidir}/tests/functional/centos/7/bs-osds-non-container
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
@ -244,10 +232,6 @@ changedir=
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_filestore_osds_container: {toxinidir}/tests/functional/centos/7/fs-osds-container
purge_bluestore_osds_container: {toxinidir}/tests/functional/centos/7/bs-osds-container
purge_filestore_osds_non_container: {toxinidir}/tests/functional/centos/7/fs-osds-non-container
purge_bluestore_osds_non_container: {toxinidir}/tests/functional/centos/7/bs-osds-non-container
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