From: Guillaume Abrioux Date: Fri, 7 Jul 2017 16:30:06 +0000 (+0200) Subject: Tests: rename tests directories X-Git-Tag: v2.3.0rc2~3^2~3 X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=f16841e09e88a89c9c0b3f3b68f45fd992e07d07;p=ceph-ansible.git Tests: rename tests directories Since we are hitting this bug : https://bugzilla.redhat.com/show_bug.cgi?id=1324587 eg: `failed: internal error: Monitor path /var/lib/libvirt/qemu/domain-bs-docker-cl uster-dmcrypt-journal-collocation_mon0_1499294943_ba9faf7bf296533177f6/monitor. sock too big for destination` and we can't upgrade libvirt in our CI for some reason we need to get the directories name shorter in order to workaround this issue Signed-off-by: Guillaume Abrioux --- diff --git a/tests/functional/centos/7/bluestore/Vagrantfile b/tests/functional/centos/7/bluestore/Vagrantfile new file mode 120000 index 000000000..dfd7436c9 --- /dev/null +++ b/tests/functional/centos/7/bluestore/Vagrantfile @@ -0,0 +1 @@ +../../../../../Vagrantfile \ No newline at end of file diff --git a/tests/functional/centos/7/bluestore/group_vars/all b/tests/functional/centos/7/bluestore/group_vars/all new file mode 100644 index 000000000..222fa7aa2 --- /dev/null +++ b/tests/functional/centos/7/bluestore/group_vars/all @@ -0,0 +1,26 @@ +--- + +ceph_stable: True +cluster: test +monitor_interface: eth1 +public_network: "192.168.1.0/24" +cluster_network: "192.168.2.0/24" +journal_size: 100 +osd_objectstore: "bluestore" +devices: + - '/dev/sda' +raw_journal_devices: + - '/dev/sdb' +raw_multi_journal: True +os_tuning_params: + - { name: kernel.pid_max, value: 4194303 } + - { name: fs.file-max, value: 26234859 } +user_config: True +openstack_config: True +ceph_conf_overrides: + global: + osd_pool_default_pg_num: 8 + osd_pool_default_size: 1 + osd: + bluestore block db size = 67108864 + bluestore block wal size = 1048576000 diff --git a/tests/functional/centos/7/bluestore/group_vars/osds b/tests/functional/centos/7/bluestore/group_vars/osds new file mode 100644 index 000000000..ed9b23ad1 --- /dev/null +++ b/tests/functional/centos/7/bluestore/group_vars/osds @@ -0,0 +1,4 @@ +--- +os_tuning_params: + - { name: kernel.pid_max, value: 4194303 } + - { name: fs.file-max, value: 26234859 } diff --git a/tests/functional/centos/7/bluestore/group_vars/rgws b/tests/functional/centos/7/bluestore/group_vars/rgws new file mode 100644 index 000000000..6aab772a0 --- /dev/null +++ b/tests/functional/centos/7/bluestore/group_vars/rgws @@ -0,0 +1,8 @@ +copy_admin_key: true +create_pools: + foo: + pg_num: 17 + bar: + pg_num: 19 +rgw_override_bucket_index_max_shards: 16 +rgw_bucket_default_quota_max_objects: 1638400 diff --git a/tests/functional/centos/7/bluestore/hosts b/tests/functional/centos/7/bluestore/hosts new file mode 100644 index 000000000..008f2cb56 --- /dev/null +++ b/tests/functional/centos/7/bluestore/hosts @@ -0,0 +1,19 @@ +[mons] +mon0 monitor_address=192.168.1.10 +mon1 monitor_interface=eth1 +mon2 monitor_address=192.168.1.12 + +[osds] +osd0 + +[mdss] +mds0 + +[rgws] +rgw0 + +[clients] +client0 + +[mgrs] +mgr0 diff --git a/tests/functional/centos/7/bluestore/vagrant_variables.yml b/tests/functional/centos/7/bluestore/vagrant_variables.yml new file mode 100644 index 000000000..576ef0034 --- /dev/null +++ b/tests/functional/centos/7/bluestore/vagrant_variables.yml @@ -0,0 +1,74 @@ +--- + +# DEPLOY CONTAINERIZED DAEMONS +docker: false + +# DEFINE THE NUMBER OF VMS TO RUN +mon_vms: 3 +osd_vms: 1 +mds_vms: 1 +rgw_vms: 1 +nfs_vms: 0 +rbd_mirror_vms: 0 +client_vms: 1 +iscsi_gw_vms: 0 +mgr_vms: 1 + +# 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.1 +cluster_subnet: 192.168.2 + +# MEMORY +# set 1024 for CentOS +memory: 512 + +# Ethernet interface name +# use eth1 for libvirt and ubuntu precise, enp0s8 for CentOS and ubuntu xenial +eth: 'eth1' + +# Disks +# For libvirt use disks: "[ '/dev/vdb', '/dev/vdc' ]" +# For CentOS7 use disks: "[ '/dev/sda', '/dev/sdb' ]" +disks: "[ '/dev/sdb', '/dev/sdc' ]" + +# VAGRANT BOX +# Ceph boxes are *strongly* suggested. They are under better control and will +# not get updated frequently unless required for build systems. These are (for +# now): +# +# * ceph/ubuntu-xenial +# +# Ubuntu: ceph/ubuntu-xenial bento/ubuntu-16.04 or ubuntu/trusty64 or ubuntu/wily64 +# CentOS: bento/centos-7.1 or puppetlabs/centos-7.0-64-puppet +# libvirt CentOS: centos/7 +# parallels Ubuntu: parallels/ubuntu-14.04 +# Debian: deb/jessie-amd64 - be careful the storage controller is named 'SATA Controller' +# For more boxes have a look at: +# - https://atlas.hashicorp.com/boxes/search?utf8=✓&sort=&provider=virtualbox&q= +# - https://download.gluster.org/pub/gluster/purpleidea/vagrant/ +vagrant_box: centos/7 +#ssh_private_key_path: "~/.ssh/id_rsa" +# The sync directory changes based on vagrant box +# Set to /home/vagrant/sync for Centos/7, /home/{ user }/vagrant for openstack and defaults to /vagrant +#vagrant_sync_dir: /home/vagrant/sync +#vagrant_sync_dir: / +# Disables synced folder creation. Not needed for testing, will skip mounting +# the vagrant directory on the remote box regardless of the provider. +vagrant_disable_synced_folder: true +# VAGRANT URL +# This is a URL to download an image from an alternate location. vagrant_box +# above should be set to the filename of the image. +# Fedora virtualbox: https://download.fedoraproject.org/pub/fedora/linux/releases/22/Cloud/x86_64/Images/Fedora-Cloud-Base-Vagrant-22-20150521.x86_64.vagrant-virtualbox.box +# Fedora libvirt: https://download.fedoraproject.org/pub/fedora/linux/releases/22/Cloud/x86_64/Images/Fedora-Cloud-Base-Vagrant-22-20150521.x86_64.vagrant-libvirt.box +# vagrant_box_url: https://download.fedoraproject.org/pub/fedora/linux/releases/22/Cloud/x86_64/Images/Fedora-Cloud-Base-Vagrant-22-20150521.x86_64.vagrant-virtualbox.box + +os_tuning_params: + - { name: kernel.pid_max, value: 4194303 } + - { name: fs.file-max, value: 26234859 } diff --git a/tests/functional/centos/7/bs-cluster/Vagrantfile b/tests/functional/centos/7/bs-cluster/Vagrantfile deleted file mode 120000 index dfd7436c9..000000000 --- a/tests/functional/centos/7/bs-cluster/Vagrantfile +++ /dev/null @@ -1 +0,0 @@ -../../../../../Vagrantfile \ No newline at end of file diff --git a/tests/functional/centos/7/bs-cluster/group_vars/all b/tests/functional/centos/7/bs-cluster/group_vars/all deleted file mode 100644 index 222fa7aa2..000000000 --- a/tests/functional/centos/7/bs-cluster/group_vars/all +++ /dev/null @@ -1,26 +0,0 @@ ---- - -ceph_stable: True -cluster: test -monitor_interface: eth1 -public_network: "192.168.1.0/24" -cluster_network: "192.168.2.0/24" -journal_size: 100 -osd_objectstore: "bluestore" -devices: - - '/dev/sda' -raw_journal_devices: - - '/dev/sdb' -raw_multi_journal: True -os_tuning_params: - - { name: kernel.pid_max, value: 4194303 } - - { name: fs.file-max, value: 26234859 } -user_config: True -openstack_config: True -ceph_conf_overrides: - global: - osd_pool_default_pg_num: 8 - osd_pool_default_size: 1 - osd: - bluestore block db size = 67108864 - bluestore block wal size = 1048576000 diff --git a/tests/functional/centos/7/bs-cluster/group_vars/osds b/tests/functional/centos/7/bs-cluster/group_vars/osds deleted file mode 100644 index ed9b23ad1..000000000 --- a/tests/functional/centos/7/bs-cluster/group_vars/osds +++ /dev/null @@ -1,4 +0,0 @@ ---- -os_tuning_params: - - { name: kernel.pid_max, value: 4194303 } - - { name: fs.file-max, value: 26234859 } diff --git a/tests/functional/centos/7/bs-cluster/group_vars/rgws b/tests/functional/centos/7/bs-cluster/group_vars/rgws deleted file mode 100644 index 6aab772a0..000000000 --- a/tests/functional/centos/7/bs-cluster/group_vars/rgws +++ /dev/null @@ -1,8 +0,0 @@ -copy_admin_key: true -create_pools: - foo: - pg_num: 17 - bar: - pg_num: 19 -rgw_override_bucket_index_max_shards: 16 -rgw_bucket_default_quota_max_objects: 1638400 diff --git a/tests/functional/centos/7/bs-cluster/hosts b/tests/functional/centos/7/bs-cluster/hosts deleted file mode 100644 index 008f2cb56..000000000 --- a/tests/functional/centos/7/bs-cluster/hosts +++ /dev/null @@ -1,19 +0,0 @@ -[mons] -mon0 monitor_address=192.168.1.10 -mon1 monitor_interface=eth1 -mon2 monitor_address=192.168.1.12 - -[osds] -osd0 - -[mdss] -mds0 - -[rgws] -rgw0 - -[clients] -client0 - -[mgrs] -mgr0 diff --git a/tests/functional/centos/7/bs-cluster/vagrant_variables.yml b/tests/functional/centos/7/bs-cluster/vagrant_variables.yml deleted file mode 100644 index 576ef0034..000000000 --- a/tests/functional/centos/7/bs-cluster/vagrant_variables.yml +++ /dev/null @@ -1,74 +0,0 @@ ---- - -# DEPLOY CONTAINERIZED DAEMONS -docker: false - -# DEFINE THE NUMBER OF VMS TO RUN -mon_vms: 3 -osd_vms: 1 -mds_vms: 1 -rgw_vms: 1 -nfs_vms: 0 -rbd_mirror_vms: 0 -client_vms: 1 -iscsi_gw_vms: 0 -mgr_vms: 1 - -# 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.1 -cluster_subnet: 192.168.2 - -# MEMORY -# set 1024 for CentOS -memory: 512 - -# Ethernet interface name -# use eth1 for libvirt and ubuntu precise, enp0s8 for CentOS and ubuntu xenial -eth: 'eth1' - -# Disks -# For libvirt use disks: "[ '/dev/vdb', '/dev/vdc' ]" -# For CentOS7 use disks: "[ '/dev/sda', '/dev/sdb' ]" -disks: "[ '/dev/sdb', '/dev/sdc' ]" - -# VAGRANT BOX -# Ceph boxes are *strongly* suggested. They are under better control and will -# not get updated frequently unless required for build systems. These are (for -# now): -# -# * ceph/ubuntu-xenial -# -# Ubuntu: ceph/ubuntu-xenial bento/ubuntu-16.04 or ubuntu/trusty64 or ubuntu/wily64 -# CentOS: bento/centos-7.1 or puppetlabs/centos-7.0-64-puppet -# libvirt CentOS: centos/7 -# parallels Ubuntu: parallels/ubuntu-14.04 -# Debian: deb/jessie-amd64 - be careful the storage controller is named 'SATA Controller' -# For more boxes have a look at: -# - https://atlas.hashicorp.com/boxes/search?utf8=✓&sort=&provider=virtualbox&q= -# - https://download.gluster.org/pub/gluster/purpleidea/vagrant/ -vagrant_box: centos/7 -#ssh_private_key_path: "~/.ssh/id_rsa" -# The sync directory changes based on vagrant box -# Set to /home/vagrant/sync for Centos/7, /home/{ user }/vagrant for openstack and defaults to /vagrant -#vagrant_sync_dir: /home/vagrant/sync -#vagrant_sync_dir: / -# Disables synced folder creation. Not needed for testing, will skip mounting -# the vagrant directory on the remote box regardless of the provider. -vagrant_disable_synced_folder: true -# VAGRANT URL -# This is a URL to download an image from an alternate location. vagrant_box -# above should be set to the filename of the image. -# Fedora virtualbox: https://download.fedoraproject.org/pub/fedora/linux/releases/22/Cloud/x86_64/Images/Fedora-Cloud-Base-Vagrant-22-20150521.x86_64.vagrant-virtualbox.box -# Fedora libvirt: https://download.fedoraproject.org/pub/fedora/linux/releases/22/Cloud/x86_64/Images/Fedora-Cloud-Base-Vagrant-22-20150521.x86_64.vagrant-libvirt.box -# vagrant_box_url: https://download.fedoraproject.org/pub/fedora/linux/releases/22/Cloud/x86_64/Images/Fedora-Cloud-Base-Vagrant-22-20150521.x86_64.vagrant-virtualbox.box - -os_tuning_params: - - { name: kernel.pid_max, value: 4194303 } - - { name: fs.file-max, value: 26234859 } diff --git a/tests/functional/centos/7/bs-crypt-ded-jrn/Vagrantfile b/tests/functional/centos/7/bs-crypt-ded-jrn/Vagrantfile new file mode 120000 index 000000000..dfd7436c9 --- /dev/null +++ b/tests/functional/centos/7/bs-crypt-ded-jrn/Vagrantfile @@ -0,0 +1 @@ +../../../../../Vagrantfile \ No newline at end of file diff --git a/tests/functional/centos/7/bs-crypt-ded-jrn/group_vars/all b/tests/functional/centos/7/bs-crypt-ded-jrn/group_vars/all new file mode 100644 index 000000000..21ac1f7e9 --- /dev/null +++ b/tests/functional/centos/7/bs-crypt-ded-jrn/group_vars/all @@ -0,0 +1,23 @@ +--- + +ceph_stable: True +public_network: "192.168.11.0/24" +cluster_network: "192.168.12.0/24" +journal_size: 100 +monitor_interface: eth1 +dmcrypt_dedicated_journal: true +osd_objectstore: "bluestore" +devices: + - '/dev/sda' +raw_journal_devices: + - '/dev/sdb' +os_tuning_params: + - { name: kernel.pid_max, value: 4194303 } + - { name: fs.file-max, value: 26234859 } +ceph_conf_overrides: + global: + osd_pool_default_pg_num: 8 + osd_pool_default_size: 1 + osd: + bluestore block db size = 67108864 + bluestore block wal size = 1048576000 diff --git a/tests/functional/centos/7/bs-crypt-ded-jrn/group_vars/osds b/tests/functional/centos/7/bs-crypt-ded-jrn/group_vars/osds new file mode 100644 index 000000000..ed9b23ad1 --- /dev/null +++ b/tests/functional/centos/7/bs-crypt-ded-jrn/group_vars/osds @@ -0,0 +1,4 @@ +--- +os_tuning_params: + - { name: kernel.pid_max, value: 4194303 } + - { name: fs.file-max, value: 26234859 } diff --git a/tests/functional/centos/7/bs-crypt-ded-jrn/hosts b/tests/functional/centos/7/bs-crypt-ded-jrn/hosts new file mode 100644 index 000000000..f6a265ab3 --- /dev/null +++ b/tests/functional/centos/7/bs-crypt-ded-jrn/hosts @@ -0,0 +1,5 @@ +[mons] +mon0 + +[osds] +osd0 diff --git a/tests/functional/centos/7/bs-crypt-ded-jrn/vagrant_variables.yml b/tests/functional/centos/7/bs-crypt-ded-jrn/vagrant_variables.yml new file mode 100644 index 000000000..8a8fb891d --- /dev/null +++ b/tests/functional/centos/7/bs-crypt-ded-jrn/vagrant_variables.yml @@ -0,0 +1,74 @@ +--- + +# DEPLOY CONTAINERIZED DAEMONS +docker: false + +# DEFINE THE NUMBER OF VMS TO RUN +mon_vms: 1 +osd_vms: 1 +mds_vms: 0 +rgw_vms: 0 +nfs_vms: 0 +rbd_mirror_vms: 0 +client_vms: 0 +iscsi_gw_vms: 0 +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.11 +cluster_subnet: 192.168.12 + +# MEMORY +# set 1024 for CentOS +memory: 512 + +# Ethernet interface name +# use eth1 for libvirt and ubuntu precise, enp0s8 for CentOS and ubuntu xenial +eth: 'eth1' + +# Disks +# For libvirt use disks: "[ '/dev/vdb', '/dev/vdc' ]" +# For CentOS7 use disks: "[ '/dev/sda', '/dev/sdb' ]" +disks: "[ '/dev/sdb', '/dev/sdc' ]" + +# VAGRANT BOX +# Ceph boxes are *strongly* suggested. They are under better control and will +# not get updated frequently unless required for build systems. These are (for +# now): +# +# * ceph/ubuntu-xenial +# +# Ubuntu: ceph/ubuntu-xenial bento/ubuntu-16.04 or ubuntu/trusty64 or ubuntu/wily64 +# CentOS: bento/centos-7.1 or puppetlabs/centos-7.0-64-puppet +# libvirt CentOS: centos/7 +# parallels Ubuntu: parallels/ubuntu-14.04 +# Debian: deb/jessie-amd64 - be careful the storage controller is named 'SATA Controller' +# For more boxes have a look at: +# - https://atlas.hashicorp.com/boxes/search?utf8=✓&sort=&provider=virtualbox&q= +# - https://download.gluster.org/pub/gluster/purpleidea/vagrant/ +vagrant_box: centos/7 +#ssh_private_key_path: "~/.ssh/id_rsa" +# The sync directory changes based on vagrant box +# Set to /home/vagrant/sync for Centos/7, /home/{ user }/vagrant for openstack and defaults to /vagrant +#vagrant_sync_dir: /home/vagrant/sync +#vagrant_sync_dir: / +# Disables synced folder creation. Not needed for testing, will skip mounting +# the vagrant directory on the remote box regardless of the provider. +vagrant_disable_synced_folder: true +# VAGRANT URL +# This is a URL to download an image from an alternate location. vagrant_box +# above should be set to the filename of the image. +# Fedora virtualbox: https://download.fedoraproject.org/pub/fedora/linux/releases/22/Cloud/x86_64/Images/Fedora-Cloud-Base-Vagrant-22-20150521.x86_64.vagrant-virtualbox.box +# Fedora libvirt: https://download.fedoraproject.org/pub/fedora/linux/releases/22/Cloud/x86_64/Images/Fedora-Cloud-Base-Vagrant-22-20150521.x86_64.vagrant-libvirt.box +# vagrant_box_url: https://download.fedoraproject.org/pub/fedora/linux/releases/22/Cloud/x86_64/Images/Fedora-Cloud-Base-Vagrant-22-20150521.x86_64.vagrant-virtualbox.box + +os_tuning_params: + - { name: kernel.pid_max, value: 4194303 } + - { name: fs.file-max, value: 26234859 } diff --git a/tests/functional/centos/7/bs-crypt-jrn-col/Vagrantfile b/tests/functional/centos/7/bs-crypt-jrn-col/Vagrantfile new file mode 120000 index 000000000..dfd7436c9 --- /dev/null +++ b/tests/functional/centos/7/bs-crypt-jrn-col/Vagrantfile @@ -0,0 +1 @@ +../../../../../Vagrantfile \ No newline at end of file diff --git a/tests/functional/centos/7/bs-crypt-jrn-col/group_vars/all b/tests/functional/centos/7/bs-crypt-jrn-col/group_vars/all new file mode 100644 index 000000000..437108972 --- /dev/null +++ b/tests/functional/centos/7/bs-crypt-jrn-col/group_vars/all @@ -0,0 +1,22 @@ +--- + +ceph_stable: True +public_network: "192.168.13.0/24" +cluster_network: "192.168.14.0/24" +journal_size: 100 +monitor_interface: eth1 +dmcrypt_journal_collocation: true +osd_objectstore: "bluestore" +devices: + - '/dev/sda' + - '/dev/sdb' +os_tuning_params: + - { name: kernel.pid_max, value: 4194303 } + - { name: fs.file-max, value: 26234859 } +ceph_conf_overrides: + global: + osd_pool_default_pg_num: 8 + osd_pool_default_size: 1 + osd: + bluestore block db size = 67108864 + bluestore block wal size = 1048576000 diff --git a/tests/functional/centos/7/bs-crypt-jrn-col/group_vars/osds b/tests/functional/centos/7/bs-crypt-jrn-col/group_vars/osds new file mode 100644 index 000000000..ed9b23ad1 --- /dev/null +++ b/tests/functional/centos/7/bs-crypt-jrn-col/group_vars/osds @@ -0,0 +1,4 @@ +--- +os_tuning_params: + - { name: kernel.pid_max, value: 4194303 } + - { name: fs.file-max, value: 26234859 } diff --git a/tests/functional/centos/7/bs-crypt-jrn-col/hosts b/tests/functional/centos/7/bs-crypt-jrn-col/hosts new file mode 100644 index 000000000..f6a265ab3 --- /dev/null +++ b/tests/functional/centos/7/bs-crypt-jrn-col/hosts @@ -0,0 +1,5 @@ +[mons] +mon0 + +[osds] +osd0 diff --git a/tests/functional/centos/7/bs-crypt-jrn-col/vagrant_variables.yml b/tests/functional/centos/7/bs-crypt-jrn-col/vagrant_variables.yml new file mode 100644 index 000000000..33ff53f7a --- /dev/null +++ b/tests/functional/centos/7/bs-crypt-jrn-col/vagrant_variables.yml @@ -0,0 +1,74 @@ +--- + +# DEPLOY CONTAINERIZED DAEMONS +docker: false + +# DEFINE THE NUMBER OF VMS TO RUN +mon_vms: 1 +osd_vms: 1 +mds_vms: 0 +rgw_vms: 0 +nfs_vms: 0 +rbd_mirror_vms: 0 +client_vms: 0 +iscsi_gw_vms: 0 +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.13 +cluster_subnet: 192.168.14 + +# MEMORY +# set 1024 for CentOS +memory: 512 + +# Ethernet interface name +# use eth1 for libvirt and ubuntu precise, enp0s8 for CentOS and ubuntu xenial +eth: 'eth1' + +# Disks +# For libvirt use disks: "[ '/dev/vdb', '/dev/vdc' ]" +# For CentOS7 use disks: "[ '/dev/sda', '/dev/sdb' ]" +disks: "[ '/dev/sdb', '/dev/sdc' ]" + +# VAGRANT BOX +# Ceph boxes are *strongly* suggested. They are under better control and will +# not get updated frequently unless required for build systems. These are (for +# now): +# +# * ceph/ubuntu-xenial +# +# Ubuntu: ceph/ubuntu-xenial bento/ubuntu-16.04 or ubuntu/trusty64 or ubuntu/wily64 +# CentOS: bento/centos-7.1 or puppetlabs/centos-7.0-64-puppet +# libvirt CentOS: centos/7 +# parallels Ubuntu: parallels/ubuntu-14.04 +# Debian: deb/jessie-amd64 - be careful the storage controller is named 'SATA Controller' +# For more boxes have a look at: +# - https://atlas.hashicorp.com/boxes/search?utf8=✓&sort=&provider=virtualbox&q= +# - https://download.gluster.org/pub/gluster/purpleidea/vagrant/ +vagrant_box: centos/7 +#ssh_private_key_path: "~/.ssh/id_rsa" +# The sync directory changes based on vagrant box +# Set to /home/vagrant/sync for Centos/7, /home/{ user }/vagrant for openstack and defaults to /vagrant +#vagrant_sync_dir: /home/vagrant/sync +#vagrant_sync_dir: / +# Disables synced folder creation. Not needed for testing, will skip mounting +# the vagrant directory on the remote box regardless of the provider. +vagrant_disable_synced_folder: true +# VAGRANT URL +# This is a URL to download an image from an alternate location. vagrant_box +# above should be set to the filename of the image. +# Fedora virtualbox: https://download.fedoraproject.org/pub/fedora/linux/releases/22/Cloud/x86_64/Images/Fedora-Cloud-Base-Vagrant-22-20150521.x86_64.vagrant-virtualbox.box +# Fedora libvirt: https://download.fedoraproject.org/pub/fedora/linux/releases/22/Cloud/x86_64/Images/Fedora-Cloud-Base-Vagrant-22-20150521.x86_64.vagrant-libvirt.box +# vagrant_box_url: https://download.fedoraproject.org/pub/fedora/linux/releases/22/Cloud/x86_64/Images/Fedora-Cloud-Base-Vagrant-22-20150521.x86_64.vagrant-virtualbox.box + +os_tuning_params: + - { name: kernel.pid_max, value: 4194303 } + - { name: fs.file-max, value: 26234859 } diff --git a/tests/functional/centos/7/bs-dmcrypt-dedicated-journal/Vagrantfile b/tests/functional/centos/7/bs-dmcrypt-dedicated-journal/Vagrantfile deleted file mode 120000 index dfd7436c9..000000000 --- a/tests/functional/centos/7/bs-dmcrypt-dedicated-journal/Vagrantfile +++ /dev/null @@ -1 +0,0 @@ -../../../../../Vagrantfile \ No newline at end of file diff --git a/tests/functional/centos/7/bs-dmcrypt-dedicated-journal/group_vars/all b/tests/functional/centos/7/bs-dmcrypt-dedicated-journal/group_vars/all deleted file mode 100644 index 21ac1f7e9..000000000 --- a/tests/functional/centos/7/bs-dmcrypt-dedicated-journal/group_vars/all +++ /dev/null @@ -1,23 +0,0 @@ ---- - -ceph_stable: True -public_network: "192.168.11.0/24" -cluster_network: "192.168.12.0/24" -journal_size: 100 -monitor_interface: eth1 -dmcrypt_dedicated_journal: true -osd_objectstore: "bluestore" -devices: - - '/dev/sda' -raw_journal_devices: - - '/dev/sdb' -os_tuning_params: - - { name: kernel.pid_max, value: 4194303 } - - { name: fs.file-max, value: 26234859 } -ceph_conf_overrides: - global: - osd_pool_default_pg_num: 8 - osd_pool_default_size: 1 - osd: - bluestore block db size = 67108864 - bluestore block wal size = 1048576000 diff --git a/tests/functional/centos/7/bs-dmcrypt-dedicated-journal/group_vars/osds b/tests/functional/centos/7/bs-dmcrypt-dedicated-journal/group_vars/osds deleted file mode 100644 index ed9b23ad1..000000000 --- a/tests/functional/centos/7/bs-dmcrypt-dedicated-journal/group_vars/osds +++ /dev/null @@ -1,4 +0,0 @@ ---- -os_tuning_params: - - { name: kernel.pid_max, value: 4194303 } - - { name: fs.file-max, value: 26234859 } diff --git a/tests/functional/centos/7/bs-dmcrypt-dedicated-journal/hosts b/tests/functional/centos/7/bs-dmcrypt-dedicated-journal/hosts deleted file mode 100644 index f6a265ab3..000000000 --- a/tests/functional/centos/7/bs-dmcrypt-dedicated-journal/hosts +++ /dev/null @@ -1,5 +0,0 @@ -[mons] -mon0 - -[osds] -osd0 diff --git a/tests/functional/centos/7/bs-dmcrypt-dedicated-journal/vagrant_variables.yml b/tests/functional/centos/7/bs-dmcrypt-dedicated-journal/vagrant_variables.yml deleted file mode 100644 index 8a8fb891d..000000000 --- a/tests/functional/centos/7/bs-dmcrypt-dedicated-journal/vagrant_variables.yml +++ /dev/null @@ -1,74 +0,0 @@ ---- - -# DEPLOY CONTAINERIZED DAEMONS -docker: false - -# DEFINE THE NUMBER OF VMS TO RUN -mon_vms: 1 -osd_vms: 1 -mds_vms: 0 -rgw_vms: 0 -nfs_vms: 0 -rbd_mirror_vms: 0 -client_vms: 0 -iscsi_gw_vms: 0 -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.11 -cluster_subnet: 192.168.12 - -# MEMORY -# set 1024 for CentOS -memory: 512 - -# Ethernet interface name -# use eth1 for libvirt and ubuntu precise, enp0s8 for CentOS and ubuntu xenial -eth: 'eth1' - -# Disks -# For libvirt use disks: "[ '/dev/vdb', '/dev/vdc' ]" -# For CentOS7 use disks: "[ '/dev/sda', '/dev/sdb' ]" -disks: "[ '/dev/sdb', '/dev/sdc' ]" - -# VAGRANT BOX -# Ceph boxes are *strongly* suggested. They are under better control and will -# not get updated frequently unless required for build systems. These are (for -# now): -# -# * ceph/ubuntu-xenial -# -# Ubuntu: ceph/ubuntu-xenial bento/ubuntu-16.04 or ubuntu/trusty64 or ubuntu/wily64 -# CentOS: bento/centos-7.1 or puppetlabs/centos-7.0-64-puppet -# libvirt CentOS: centos/7 -# parallels Ubuntu: parallels/ubuntu-14.04 -# Debian: deb/jessie-amd64 - be careful the storage controller is named 'SATA Controller' -# For more boxes have a look at: -# - https://atlas.hashicorp.com/boxes/search?utf8=✓&sort=&provider=virtualbox&q= -# - https://download.gluster.org/pub/gluster/purpleidea/vagrant/ -vagrant_box: centos/7 -#ssh_private_key_path: "~/.ssh/id_rsa" -# The sync directory changes based on vagrant box -# Set to /home/vagrant/sync for Centos/7, /home/{ user }/vagrant for openstack and defaults to /vagrant -#vagrant_sync_dir: /home/vagrant/sync -#vagrant_sync_dir: / -# Disables synced folder creation. Not needed for testing, will skip mounting -# the vagrant directory on the remote box regardless of the provider. -vagrant_disable_synced_folder: true -# VAGRANT URL -# This is a URL to download an image from an alternate location. vagrant_box -# above should be set to the filename of the image. -# Fedora virtualbox: https://download.fedoraproject.org/pub/fedora/linux/releases/22/Cloud/x86_64/Images/Fedora-Cloud-Base-Vagrant-22-20150521.x86_64.vagrant-virtualbox.box -# Fedora libvirt: https://download.fedoraproject.org/pub/fedora/linux/releases/22/Cloud/x86_64/Images/Fedora-Cloud-Base-Vagrant-22-20150521.x86_64.vagrant-libvirt.box -# vagrant_box_url: https://download.fedoraproject.org/pub/fedora/linux/releases/22/Cloud/x86_64/Images/Fedora-Cloud-Base-Vagrant-22-20150521.x86_64.vagrant-virtualbox.box - -os_tuning_params: - - { name: kernel.pid_max, value: 4194303 } - - { name: fs.file-max, value: 26234859 } diff --git a/tests/functional/centos/7/bs-dmcrypt-journal-colloc/Vagrantfile b/tests/functional/centos/7/bs-dmcrypt-journal-colloc/Vagrantfile deleted file mode 120000 index dfd7436c9..000000000 --- a/tests/functional/centos/7/bs-dmcrypt-journal-colloc/Vagrantfile +++ /dev/null @@ -1 +0,0 @@ -../../../../../Vagrantfile \ No newline at end of file diff --git a/tests/functional/centos/7/bs-dmcrypt-journal-colloc/group_vars/all b/tests/functional/centos/7/bs-dmcrypt-journal-colloc/group_vars/all deleted file mode 100644 index 437108972..000000000 --- a/tests/functional/centos/7/bs-dmcrypt-journal-colloc/group_vars/all +++ /dev/null @@ -1,22 +0,0 @@ ---- - -ceph_stable: True -public_network: "192.168.13.0/24" -cluster_network: "192.168.14.0/24" -journal_size: 100 -monitor_interface: eth1 -dmcrypt_journal_collocation: true -osd_objectstore: "bluestore" -devices: - - '/dev/sda' - - '/dev/sdb' -os_tuning_params: - - { name: kernel.pid_max, value: 4194303 } - - { name: fs.file-max, value: 26234859 } -ceph_conf_overrides: - global: - osd_pool_default_pg_num: 8 - osd_pool_default_size: 1 - osd: - bluestore block db size = 67108864 - bluestore block wal size = 1048576000 diff --git a/tests/functional/centos/7/bs-dmcrypt-journal-colloc/group_vars/osds b/tests/functional/centos/7/bs-dmcrypt-journal-colloc/group_vars/osds deleted file mode 100644 index ed9b23ad1..000000000 --- a/tests/functional/centos/7/bs-dmcrypt-journal-colloc/group_vars/osds +++ /dev/null @@ -1,4 +0,0 @@ ---- -os_tuning_params: - - { name: kernel.pid_max, value: 4194303 } - - { name: fs.file-max, value: 26234859 } diff --git a/tests/functional/centos/7/bs-dmcrypt-journal-colloc/hosts b/tests/functional/centos/7/bs-dmcrypt-journal-colloc/hosts deleted file mode 100644 index f6a265ab3..000000000 --- a/tests/functional/centos/7/bs-dmcrypt-journal-colloc/hosts +++ /dev/null @@ -1,5 +0,0 @@ -[mons] -mon0 - -[osds] -osd0 diff --git a/tests/functional/centos/7/bs-dmcrypt-journal-colloc/vagrant_variables.yml b/tests/functional/centos/7/bs-dmcrypt-journal-colloc/vagrant_variables.yml deleted file mode 100644 index 33ff53f7a..000000000 --- a/tests/functional/centos/7/bs-dmcrypt-journal-colloc/vagrant_variables.yml +++ /dev/null @@ -1,74 +0,0 @@ ---- - -# DEPLOY CONTAINERIZED DAEMONS -docker: false - -# DEFINE THE NUMBER OF VMS TO RUN -mon_vms: 1 -osd_vms: 1 -mds_vms: 0 -rgw_vms: 0 -nfs_vms: 0 -rbd_mirror_vms: 0 -client_vms: 0 -iscsi_gw_vms: 0 -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.13 -cluster_subnet: 192.168.14 - -# MEMORY -# set 1024 for CentOS -memory: 512 - -# Ethernet interface name -# use eth1 for libvirt and ubuntu precise, enp0s8 for CentOS and ubuntu xenial -eth: 'eth1' - -# Disks -# For libvirt use disks: "[ '/dev/vdb', '/dev/vdc' ]" -# For CentOS7 use disks: "[ '/dev/sda', '/dev/sdb' ]" -disks: "[ '/dev/sdb', '/dev/sdc' ]" - -# VAGRANT BOX -# Ceph boxes are *strongly* suggested. They are under better control and will -# not get updated frequently unless required for build systems. These are (for -# now): -# -# * ceph/ubuntu-xenial -# -# Ubuntu: ceph/ubuntu-xenial bento/ubuntu-16.04 or ubuntu/trusty64 or ubuntu/wily64 -# CentOS: bento/centos-7.1 or puppetlabs/centos-7.0-64-puppet -# libvirt CentOS: centos/7 -# parallels Ubuntu: parallels/ubuntu-14.04 -# Debian: deb/jessie-amd64 - be careful the storage controller is named 'SATA Controller' -# For more boxes have a look at: -# - https://atlas.hashicorp.com/boxes/search?utf8=✓&sort=&provider=virtualbox&q= -# - https://download.gluster.org/pub/gluster/purpleidea/vagrant/ -vagrant_box: centos/7 -#ssh_private_key_path: "~/.ssh/id_rsa" -# The sync directory changes based on vagrant box -# Set to /home/vagrant/sync for Centos/7, /home/{ user }/vagrant for openstack and defaults to /vagrant -#vagrant_sync_dir: /home/vagrant/sync -#vagrant_sync_dir: / -# Disables synced folder creation. Not needed for testing, will skip mounting -# the vagrant directory on the remote box regardless of the provider. -vagrant_disable_synced_folder: true -# VAGRANT URL -# This is a URL to download an image from an alternate location. vagrant_box -# above should be set to the filename of the image. -# Fedora virtualbox: https://download.fedoraproject.org/pub/fedora/linux/releases/22/Cloud/x86_64/Images/Fedora-Cloud-Base-Vagrant-22-20150521.x86_64.vagrant-virtualbox.box -# Fedora libvirt: https://download.fedoraproject.org/pub/fedora/linux/releases/22/Cloud/x86_64/Images/Fedora-Cloud-Base-Vagrant-22-20150521.x86_64.vagrant-libvirt.box -# vagrant_box_url: https://download.fedoraproject.org/pub/fedora/linux/releases/22/Cloud/x86_64/Images/Fedora-Cloud-Base-Vagrant-22-20150521.x86_64.vagrant-virtualbox.box - -os_tuning_params: - - { name: kernel.pid_max, value: 4194303 } - - { name: fs.file-max, value: 26234859 } diff --git a/tests/functional/centos/7/bs-dock-crypt-jrn-col/Vagrantfile b/tests/functional/centos/7/bs-dock-crypt-jrn-col/Vagrantfile new file mode 120000 index 000000000..dfd7436c9 --- /dev/null +++ b/tests/functional/centos/7/bs-dock-crypt-jrn-col/Vagrantfile @@ -0,0 +1 @@ +../../../../../Vagrantfile \ No newline at end of file diff --git a/tests/functional/centos/7/bs-dock-crypt-jrn-col/group_vars/all b/tests/functional/centos/7/bs-dock-crypt-jrn-col/group_vars/all new file mode 100644 index 000000000..6a2a585e1 --- /dev/null +++ b/tests/functional/centos/7/bs-dock-crypt-jrn-col/group_vars/all @@ -0,0 +1,26 @@ +--- +docker: true +containerized_deployment: True +ceph_stable: True +ceph_mon_docker_subnet: "{{ public_network }}" +public_network: "192.168.23.0/24" +cluster_network: "192.168.24.0/24" +journal_size: 100 +monitor_interface: eth1 +dmcrypt_journal_collocation: true +osd_objectstore: "bluestore" +devices: + - '/dev/sda' + - '/dev/sdb' +os_tuning_params: + - { name: kernel.pid_max, value: 4194303 } + - { name: fs.file-max, value: 26234859 } +ceph_conf_overrides: + global: + osd_pool_default_pg_num: 8 + osd_pool_default_size: 1 + osd: + bluestore block db size = 67108864 + bluestore block wal size = 1048576000 +ceph_osd_docker_prepare_env: -e CLUSTER={{ cluster }} -e OSD_JOURNAL_SIZE={{ journal_size }} -e OSD_FORCE_ZAP=1 -e OSD_DMCRYPT=1 +ceph_osd_docker_extra_env: -e CLUSTER={{ cluster }} -e CEPH_DAEMON=OSD_CEPH_DISK_ACTIVATE -e OSD_JOURNAL_SIZE={{ journal_size }} -e OSD_DMCRYPT=1 diff --git a/tests/functional/centos/7/bs-dock-crypt-jrn-col/group_vars/osds b/tests/functional/centos/7/bs-dock-crypt-jrn-col/group_vars/osds new file mode 100644 index 000000000..ed9b23ad1 --- /dev/null +++ b/tests/functional/centos/7/bs-dock-crypt-jrn-col/group_vars/osds @@ -0,0 +1,4 @@ +--- +os_tuning_params: + - { name: kernel.pid_max, value: 4194303 } + - { name: fs.file-max, value: 26234859 } diff --git a/tests/functional/centos/7/bs-dock-crypt-jrn-col/hosts b/tests/functional/centos/7/bs-dock-crypt-jrn-col/hosts new file mode 100644 index 000000000..f6a265ab3 --- /dev/null +++ b/tests/functional/centos/7/bs-dock-crypt-jrn-col/hosts @@ -0,0 +1,5 @@ +[mons] +mon0 + +[osds] +osd0 diff --git a/tests/functional/centos/7/bs-dock-crypt-jrn-col/vagrant_variables.yml b/tests/functional/centos/7/bs-dock-crypt-jrn-col/vagrant_variables.yml new file mode 100644 index 000000000..6e03fab97 --- /dev/null +++ b/tests/functional/centos/7/bs-dock-crypt-jrn-col/vagrant_variables.yml @@ -0,0 +1,74 @@ +--- + +# 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.23 +cluster_subnet: 192.168.24 + +# MEMORY +# set 1024 for CentOS +memory: 512 + +# Ethernet interface name +# use eth1 for libvirt and ubuntu precise, enp0s8 for CentOS and ubuntu xenial +eth: 'eth1' + +# Disks +# For libvirt use disks: "[ '/dev/vdb', '/dev/vdc' ]" +# For CentOS7 use disks: "[ '/dev/sda', '/dev/sdb' ]" +disks: "[ '/dev/sdb', '/dev/sdc' ]" + +# VAGRANT BOX +# Ceph boxes are *strongly* suggested. They are under better control and will +# not get updated frequently unless required for build systems. These are (for +# now): +# +# * ceph/ubuntu-xenial +# +# Ubuntu: ceph/ubuntu-xenial bento/ubuntu-16.04 or ubuntu/trusty64 or ubuntu/wily64 +# CentOS: bento/centos-7.1 or puppetlabs/centos-7.0-64-puppet +# libvirt CentOS: centos/7 +# parallels Ubuntu: parallels/ubuntu-14.04 +# Debian: deb/jessie-amd64 - be careful the storage controller is named 'SATA Controller' +# For more boxes have a look at: +# - https://atlas.hashicorp.com/boxes/search?utf8=✓&sort=&provider=virtualbox&q= +# - https://download.gluster.org/pub/gluster/purpleidea/vagrant/ +vagrant_box: centos/7 +#ssh_private_key_path: "~/.ssh/id_rsa" +# The sync directory changes based on vagrant box +# Set to /home/vagrant/sync for Centos/7, /home/{ user }/vagrant for openstack and defaults to /vagrant +#vagrant_sync_dir: /home/vagrant/sync +#vagrant_sync_dir: / +# Disables synced folder creation. Not needed for testing, will skip mounting +# the vagrant directory on the remote box regardless of the provider. +vagrant_disable_synced_folder: true +# VAGRANT URL +# This is a URL to download an image from an alternate location. vagrant_box +# above should be set to the filename of the image. +# Fedora virtualbox: https://download.fedoraproject.org/pub/fedora/linux/releases/22/Cloud/x86_64/Images/Fedora-Cloud-Base-Vagrant-22-20150521.x86_64.vagrant-virtualbox.box +# Fedora libvirt: https://download.fedoraproject.org/pub/fedora/linux/releases/22/Cloud/x86_64/Images/Fedora-Cloud-Base-Vagrant-22-20150521.x86_64.vagrant-libvirt.box +# vagrant_box_url: https://download.fedoraproject.org/pub/fedora/linux/releases/22/Cloud/x86_64/Images/Fedora-Cloud-Base-Vagrant-22-20150521.x86_64.vagrant-virtualbox.box + +os_tuning_params: + - { name: kernel.pid_max, value: 4194303 } + - { name: fs.file-max, value: 26234859 } diff --git a/tests/functional/centos/7/bs-dock-ded-jrn/Vagrantfile b/tests/functional/centos/7/bs-dock-ded-jrn/Vagrantfile new file mode 120000 index 000000000..dfd7436c9 --- /dev/null +++ b/tests/functional/centos/7/bs-dock-ded-jrn/Vagrantfile @@ -0,0 +1 @@ +../../../../../Vagrantfile \ No newline at end of file diff --git a/tests/functional/centos/7/bs-dock-ded-jrn/group_vars/all b/tests/functional/centos/7/bs-dock-ded-jrn/group_vars/all new file mode 100644 index 000000000..09176dc58 --- /dev/null +++ b/tests/functional/centos/7/bs-dock-ded-jrn/group_vars/all @@ -0,0 +1,23 @@ +--- +# this is only here to let the CI tests know +# that this scenario is using docker +docker: True + +ceph_stable: True +containerized_deployment: True +cluster: test +monitor_interface: eth1 +ceph_mon_docker_subnet: "{{ public_network }}" +journal_size: 100 +ceph_docker_on_openstack: False +public_network: "192.168.15.0/24" +cluster_network: "192.168.16.0/24" +ceph_rgw_civetweb_port: 8080 +ceph_osd_docker_devices: "{{ devices }}" +devices: + - /dev/sda +raw_journal_devices: + - /dev/sdb +ceph_osd_docker_prepare_env: -e CLUSTER={{ cluster }} -e OSD_FORCE_ZAP=1 -e OSD_JOURNAL={{ raw_journal_devices[0] }} -e OSD_BLUESTORE=1 +ceph_osd_docker_extra_env: -e CLUSTER={{ cluster }} -e CEPH_DAEMON=OSD_CEPH_DISK_ACTIVATE -e OSD_BLUESTORE=1 +ceph_osd_docker_run_script_path: /var/tmp diff --git a/tests/functional/centos/7/bs-dock-ded-jrn/hosts b/tests/functional/centos/7/bs-dock-ded-jrn/hosts new file mode 100644 index 000000000..f6a265ab3 --- /dev/null +++ b/tests/functional/centos/7/bs-dock-ded-jrn/hosts @@ -0,0 +1,5 @@ +[mons] +mon0 + +[osds] +osd0 diff --git a/tests/functional/centos/7/bs-dock-ded-jrn/vagrant_variables.yml b/tests/functional/centos/7/bs-dock-ded-jrn/vagrant_variables.yml new file mode 100644 index 000000000..aa03b197c --- /dev/null +++ b/tests/functional/centos/7/bs-dock-ded-jrn/vagrant_variables.yml @@ -0,0 +1,52 @@ +--- + +# 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 + +# SUBNETS TO USE FOR THE VMS +public_subnet: 192.168.15 +cluster_subnet: 192.168.16 + +# 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 +# +# NOTE(leseb): we use centos for this scenario since we at least need Docker version 1.12.5 +# which is not available in Atomic Host. +# There are bug like this one: https://github.com/docker/docker/issues/12694 +vagrant_box: centos/7 + +#ssh_private_key_path: "~/.ssh/id_rsa" +# The sync directory changes based on vagrant box +# Set to /home/vagrant/sync for Centos/7, /home/{ user }/vagrant for openstack and defaults to /vagrant +#vagrant_sync_dir: /home/vagrant/sync +#vagrant_sync_dir: / +# Disables synced folder creation. Not needed for testing, will skip mounting +# the vagrant directory on the remote box regardless of the provider. +vagrant_disable_synced_folder: true diff --git a/tests/functional/centos/7/bs-docker-cluster-dedicated-journal/Vagrantfile b/tests/functional/centos/7/bs-docker-cluster-dedicated-journal/Vagrantfile deleted file mode 120000 index dfd7436c9..000000000 --- a/tests/functional/centos/7/bs-docker-cluster-dedicated-journal/Vagrantfile +++ /dev/null @@ -1 +0,0 @@ -../../../../../Vagrantfile \ No newline at end of file diff --git a/tests/functional/centos/7/bs-docker-cluster-dedicated-journal/group_vars/all b/tests/functional/centos/7/bs-docker-cluster-dedicated-journal/group_vars/all deleted file mode 100644 index 09176dc58..000000000 --- a/tests/functional/centos/7/bs-docker-cluster-dedicated-journal/group_vars/all +++ /dev/null @@ -1,23 +0,0 @@ ---- -# this is only here to let the CI tests know -# that this scenario is using docker -docker: True - -ceph_stable: True -containerized_deployment: True -cluster: test -monitor_interface: eth1 -ceph_mon_docker_subnet: "{{ public_network }}" -journal_size: 100 -ceph_docker_on_openstack: False -public_network: "192.168.15.0/24" -cluster_network: "192.168.16.0/24" -ceph_rgw_civetweb_port: 8080 -ceph_osd_docker_devices: "{{ devices }}" -devices: - - /dev/sda -raw_journal_devices: - - /dev/sdb -ceph_osd_docker_prepare_env: -e CLUSTER={{ cluster }} -e OSD_FORCE_ZAP=1 -e OSD_JOURNAL={{ raw_journal_devices[0] }} -e OSD_BLUESTORE=1 -ceph_osd_docker_extra_env: -e CLUSTER={{ cluster }} -e CEPH_DAEMON=OSD_CEPH_DISK_ACTIVATE -e OSD_BLUESTORE=1 -ceph_osd_docker_run_script_path: /var/tmp diff --git a/tests/functional/centos/7/bs-docker-cluster-dedicated-journal/hosts b/tests/functional/centos/7/bs-docker-cluster-dedicated-journal/hosts deleted file mode 100644 index f6a265ab3..000000000 --- a/tests/functional/centos/7/bs-docker-cluster-dedicated-journal/hosts +++ /dev/null @@ -1,5 +0,0 @@ -[mons] -mon0 - -[osds] -osd0 diff --git a/tests/functional/centos/7/bs-docker-cluster-dedicated-journal/vagrant_variables.yml b/tests/functional/centos/7/bs-docker-cluster-dedicated-journal/vagrant_variables.yml deleted file mode 100644 index aa03b197c..000000000 --- a/tests/functional/centos/7/bs-docker-cluster-dedicated-journal/vagrant_variables.yml +++ /dev/null @@ -1,52 +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 - -# SUBNETS TO USE FOR THE VMS -public_subnet: 192.168.15 -cluster_subnet: 192.168.16 - -# 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 -# -# NOTE(leseb): we use centos for this scenario since we at least need Docker version 1.12.5 -# which is not available in Atomic Host. -# There are bug like this one: https://github.com/docker/docker/issues/12694 -vagrant_box: centos/7 - -#ssh_private_key_path: "~/.ssh/id_rsa" -# The sync directory changes based on vagrant box -# Set to /home/vagrant/sync for Centos/7, /home/{ user }/vagrant for openstack and defaults to /vagrant -#vagrant_sync_dir: /home/vagrant/sync -#vagrant_sync_dir: / -# Disables synced folder creation. Not needed for testing, will skip mounting -# the vagrant directory on the remote box regardless of the provider. -vagrant_disable_synced_folder: true diff --git a/tests/functional/centos/7/bs-docker-cluster/Vagrantfile b/tests/functional/centos/7/bs-docker-cluster/Vagrantfile deleted file mode 120000 index dfd7436c9..000000000 --- a/tests/functional/centos/7/bs-docker-cluster/Vagrantfile +++ /dev/null @@ -1 +0,0 @@ -../../../../../Vagrantfile \ No newline at end of file diff --git a/tests/functional/centos/7/bs-docker-cluster/group_vars/all b/tests/functional/centos/7/bs-docker-cluster/group_vars/all deleted file mode 100644 index bc10cd192..000000000 --- a/tests/functional/centos/7/bs-docker-cluster/group_vars/all +++ /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_stable: True -containerized_deployment: True -cluster: test -monitor_interface: eth1 -ceph_mon_docker_subnet: "{{ public_network }}" -journal_size: 100 -ceph_docker_on_openstack: False -public_network: "192.168.15.0/24" -cluster_network: "192.168.16.0/24" -journal_collocation: true -ceph_rgw_civetweb_port: 8080 -ceph_osd_docker_devices: "{{ devices }}" -ceph_osd_docker_prepare_env: -e CLUSTER={{ cluster }} -e OSD_FORCE_ZAP=1 -e OSD_BLUESTORE=1 -ceph_osd_docker_extra_env: -e CLUSTER={{ cluster }} -e CEPH_DAEMON=OSD_CEPH_DISK_ACTIVATE -e OSD_BLUESTORE=1 -devices: - - /dev/sda - - /dev/sdb -ceph_osd_docker_run_script_path: /var/tmp -rgw_override_bucket_index_max_shards: 16 -rgw_bucket_default_quota_max_objects: 1638400 -ceph_conf_overrides: - global: - osd_pool_default_pg_num: 8 - osd_pool_default_size: 1 diff --git a/tests/functional/centos/7/bs-docker-cluster/hosts b/tests/functional/centos/7/bs-docker-cluster/hosts deleted file mode 100644 index 2d684367d..000000000 --- a/tests/functional/centos/7/bs-docker-cluster/hosts +++ /dev/null @@ -1,16 +0,0 @@ -[mons] -mon0 -mon1 -mon2 - -[osds] -osd0 - -[mdss] -mds0 - -[rgws] -rgw0 - -[mgrs] -mgr0 diff --git a/tests/functional/centos/7/bs-docker-cluster/vagrant_variables.yml b/tests/functional/centos/7/bs-docker-cluster/vagrant_variables.yml deleted file mode 100644 index 5c4d1081f..000000000 --- a/tests/functional/centos/7/bs-docker-cluster/vagrant_variables.yml +++ /dev/null @@ -1,62 +0,0 @@ ---- - -# DEPLOY CONTAINERIZED DAEMONS -docker: True - -# DEFINE THE NUMBER OF VMS TO RUN -mon_vms: 3 -osd_vms: 1 -mds_vms: 1 -rgw_vms: 1 -nfs_vms: 0 -rbd_mirror_vms: 1 -client_vms: 0 -iscsi_gw_vms: 0 -mgr_vms: 1 - -# Deploy RESTAPI on each of the Monitors -restapi: true - -# SUBNETS TO USE FOR THE VMS -public_subnet: 192.168.15 -cluster_subnet: 192.168.16 - -# 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 -#ssh_private_key_path: "~/.ssh/id_rsa" -# The sync directory changes based on vagrant box -# Set to /home/vagrant/sync for Centos/7, /home/{ user }/vagrant for openstack and defaults to /vagrant -#vagrant_sync_dir: /home/vagrant/sync -#vagrant_sync_dir: / -# Disables synced folder creation. Not needed for testing, will skip mounting -# the vagrant directory on the remote box regardless of the provider. -vagrant_disable_synced_folder: true -# VAGRANT URL -# This is a URL to download an image from an alternate location. vagrant_box -# above should be set to the filename of the image. -# Fedora virtualbox: https://download.fedoraproject.org/pub/fedora/linux/releases/22/Cloud/x86_64/Images/Fedora-Cloud-Base-Vagrant-22-20150521.x86_64.vagrant-virtualbox.box -# Fedora libvirt: https://download.fedoraproject.org/pub/fedora/linux/releases/22/Cloud/x86_64/Images/Fedora-Cloud-Base-Vagrant-22-20150521.x86_64.vagrant-libvirt.box -# vagrant_box_url: https://download.fedoraproject.org/pub/fedora/linux/releases/22/Cloud/x86_64/Images/Fedora-Cloud-Base-Vagrant-22-20150521.x86_64.vagrant-virtualbox.box diff --git a/tests/functional/centos/7/bs-docker-dmcrypt-journal-colloc/Vagrantfile b/tests/functional/centos/7/bs-docker-dmcrypt-journal-colloc/Vagrantfile deleted file mode 120000 index dfd7436c9..000000000 --- a/tests/functional/centos/7/bs-docker-dmcrypt-journal-colloc/Vagrantfile +++ /dev/null @@ -1 +0,0 @@ -../../../../../Vagrantfile \ No newline at end of file diff --git a/tests/functional/centos/7/bs-docker-dmcrypt-journal-colloc/group_vars/all b/tests/functional/centos/7/bs-docker-dmcrypt-journal-colloc/group_vars/all deleted file mode 100644 index 6a2a585e1..000000000 --- a/tests/functional/centos/7/bs-docker-dmcrypt-journal-colloc/group_vars/all +++ /dev/null @@ -1,26 +0,0 @@ ---- -docker: true -containerized_deployment: True -ceph_stable: True -ceph_mon_docker_subnet: "{{ public_network }}" -public_network: "192.168.23.0/24" -cluster_network: "192.168.24.0/24" -journal_size: 100 -monitor_interface: eth1 -dmcrypt_journal_collocation: true -osd_objectstore: "bluestore" -devices: - - '/dev/sda' - - '/dev/sdb' -os_tuning_params: - - { name: kernel.pid_max, value: 4194303 } - - { name: fs.file-max, value: 26234859 } -ceph_conf_overrides: - global: - osd_pool_default_pg_num: 8 - osd_pool_default_size: 1 - osd: - bluestore block db size = 67108864 - bluestore block wal size = 1048576000 -ceph_osd_docker_prepare_env: -e CLUSTER={{ cluster }} -e OSD_JOURNAL_SIZE={{ journal_size }} -e OSD_FORCE_ZAP=1 -e OSD_DMCRYPT=1 -ceph_osd_docker_extra_env: -e CLUSTER={{ cluster }} -e CEPH_DAEMON=OSD_CEPH_DISK_ACTIVATE -e OSD_JOURNAL_SIZE={{ journal_size }} -e OSD_DMCRYPT=1 diff --git a/tests/functional/centos/7/bs-docker-dmcrypt-journal-colloc/group_vars/osds b/tests/functional/centos/7/bs-docker-dmcrypt-journal-colloc/group_vars/osds deleted file mode 100644 index ed9b23ad1..000000000 --- a/tests/functional/centos/7/bs-docker-dmcrypt-journal-colloc/group_vars/osds +++ /dev/null @@ -1,4 +0,0 @@ ---- -os_tuning_params: - - { name: kernel.pid_max, value: 4194303 } - - { name: fs.file-max, value: 26234859 } diff --git a/tests/functional/centos/7/bs-docker-dmcrypt-journal-colloc/hosts b/tests/functional/centos/7/bs-docker-dmcrypt-journal-colloc/hosts deleted file mode 100644 index f6a265ab3..000000000 --- a/tests/functional/centos/7/bs-docker-dmcrypt-journal-colloc/hosts +++ /dev/null @@ -1,5 +0,0 @@ -[mons] -mon0 - -[osds] -osd0 diff --git a/tests/functional/centos/7/bs-docker-dmcrypt-journal-colloc/vagrant_variables.yml b/tests/functional/centos/7/bs-docker-dmcrypt-journal-colloc/vagrant_variables.yml deleted file mode 100644 index 6e03fab97..000000000 --- a/tests/functional/centos/7/bs-docker-dmcrypt-journal-colloc/vagrant_variables.yml +++ /dev/null @@ -1,74 +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.23 -cluster_subnet: 192.168.24 - -# MEMORY -# set 1024 for CentOS -memory: 512 - -# Ethernet interface name -# use eth1 for libvirt and ubuntu precise, enp0s8 for CentOS and ubuntu xenial -eth: 'eth1' - -# Disks -# For libvirt use disks: "[ '/dev/vdb', '/dev/vdc' ]" -# For CentOS7 use disks: "[ '/dev/sda', '/dev/sdb' ]" -disks: "[ '/dev/sdb', '/dev/sdc' ]" - -# VAGRANT BOX -# Ceph boxes are *strongly* suggested. They are under better control and will -# not get updated frequently unless required for build systems. These are (for -# now): -# -# * ceph/ubuntu-xenial -# -# Ubuntu: ceph/ubuntu-xenial bento/ubuntu-16.04 or ubuntu/trusty64 or ubuntu/wily64 -# CentOS: bento/centos-7.1 or puppetlabs/centos-7.0-64-puppet -# libvirt CentOS: centos/7 -# parallels Ubuntu: parallels/ubuntu-14.04 -# Debian: deb/jessie-amd64 - be careful the storage controller is named 'SATA Controller' -# For more boxes have a look at: -# - https://atlas.hashicorp.com/boxes/search?utf8=✓&sort=&provider=virtualbox&q= -# - https://download.gluster.org/pub/gluster/purpleidea/vagrant/ -vagrant_box: centos/7 -#ssh_private_key_path: "~/.ssh/id_rsa" -# The sync directory changes based on vagrant box -# Set to /home/vagrant/sync for Centos/7, /home/{ user }/vagrant for openstack and defaults to /vagrant -#vagrant_sync_dir: /home/vagrant/sync -#vagrant_sync_dir: / -# Disables synced folder creation. Not needed for testing, will skip mounting -# the vagrant directory on the remote box regardless of the provider. -vagrant_disable_synced_folder: true -# VAGRANT URL -# This is a URL to download an image from an alternate location. vagrant_box -# above should be set to the filename of the image. -# Fedora virtualbox: https://download.fedoraproject.org/pub/fedora/linux/releases/22/Cloud/x86_64/Images/Fedora-Cloud-Base-Vagrant-22-20150521.x86_64.vagrant-virtualbox.box -# Fedora libvirt: https://download.fedoraproject.org/pub/fedora/linux/releases/22/Cloud/x86_64/Images/Fedora-Cloud-Base-Vagrant-22-20150521.x86_64.vagrant-libvirt.box -# vagrant_box_url: https://download.fedoraproject.org/pub/fedora/linux/releases/22/Cloud/x86_64/Images/Fedora-Cloud-Base-Vagrant-22-20150521.x86_64.vagrant-virtualbox.box - -os_tuning_params: - - { name: kernel.pid_max, value: 4194303 } - - { name: fs.file-max, value: 26234859 } diff --git a/tests/functional/centos/7/bs-docker/Vagrantfile b/tests/functional/centos/7/bs-docker/Vagrantfile new file mode 120000 index 000000000..dfd7436c9 --- /dev/null +++ b/tests/functional/centos/7/bs-docker/Vagrantfile @@ -0,0 +1 @@ +../../../../../Vagrantfile \ No newline at end of file diff --git a/tests/functional/centos/7/bs-docker/group_vars/all b/tests/functional/centos/7/bs-docker/group_vars/all new file mode 100644 index 000000000..bc10cd192 --- /dev/null +++ b/tests/functional/centos/7/bs-docker/group_vars/all @@ -0,0 +1,29 @@ +--- +# this is only here to let the CI tests know +# that this scenario is using docker +docker: True + +ceph_stable: True +containerized_deployment: True +cluster: test +monitor_interface: eth1 +ceph_mon_docker_subnet: "{{ public_network }}" +journal_size: 100 +ceph_docker_on_openstack: False +public_network: "192.168.15.0/24" +cluster_network: "192.168.16.0/24" +journal_collocation: true +ceph_rgw_civetweb_port: 8080 +ceph_osd_docker_devices: "{{ devices }}" +ceph_osd_docker_prepare_env: -e CLUSTER={{ cluster }} -e OSD_FORCE_ZAP=1 -e OSD_BLUESTORE=1 +ceph_osd_docker_extra_env: -e CLUSTER={{ cluster }} -e CEPH_DAEMON=OSD_CEPH_DISK_ACTIVATE -e OSD_BLUESTORE=1 +devices: + - /dev/sda + - /dev/sdb +ceph_osd_docker_run_script_path: /var/tmp +rgw_override_bucket_index_max_shards: 16 +rgw_bucket_default_quota_max_objects: 1638400 +ceph_conf_overrides: + global: + osd_pool_default_pg_num: 8 + osd_pool_default_size: 1 diff --git a/tests/functional/centos/7/bs-docker/hosts b/tests/functional/centos/7/bs-docker/hosts new file mode 100644 index 000000000..2d684367d --- /dev/null +++ b/tests/functional/centos/7/bs-docker/hosts @@ -0,0 +1,16 @@ +[mons] +mon0 +mon1 +mon2 + +[osds] +osd0 + +[mdss] +mds0 + +[rgws] +rgw0 + +[mgrs] +mgr0 diff --git a/tests/functional/centos/7/bs-docker/vagrant_variables.yml b/tests/functional/centos/7/bs-docker/vagrant_variables.yml new file mode 100644 index 000000000..5c4d1081f --- /dev/null +++ b/tests/functional/centos/7/bs-docker/vagrant_variables.yml @@ -0,0 +1,62 @@ +--- + +# DEPLOY CONTAINERIZED DAEMONS +docker: True + +# DEFINE THE NUMBER OF VMS TO RUN +mon_vms: 3 +osd_vms: 1 +mds_vms: 1 +rgw_vms: 1 +nfs_vms: 0 +rbd_mirror_vms: 1 +client_vms: 0 +iscsi_gw_vms: 0 +mgr_vms: 1 + +# Deploy RESTAPI on each of the Monitors +restapi: true + +# SUBNETS TO USE FOR THE VMS +public_subnet: 192.168.15 +cluster_subnet: 192.168.16 + +# 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 +#ssh_private_key_path: "~/.ssh/id_rsa" +# The sync directory changes based on vagrant box +# Set to /home/vagrant/sync for Centos/7, /home/{ user }/vagrant for openstack and defaults to /vagrant +#vagrant_sync_dir: /home/vagrant/sync +#vagrant_sync_dir: / +# Disables synced folder creation. Not needed for testing, will skip mounting +# the vagrant directory on the remote box regardless of the provider. +vagrant_disable_synced_folder: true +# VAGRANT URL +# This is a URL to download an image from an alternate location. vagrant_box +# above should be set to the filename of the image. +# Fedora virtualbox: https://download.fedoraproject.org/pub/fedora/linux/releases/22/Cloud/x86_64/Images/Fedora-Cloud-Base-Vagrant-22-20150521.x86_64.vagrant-virtualbox.box +# Fedora libvirt: https://download.fedoraproject.org/pub/fedora/linux/releases/22/Cloud/x86_64/Images/Fedora-Cloud-Base-Vagrant-22-20150521.x86_64.vagrant-libvirt.box +# vagrant_box_url: https://download.fedoraproject.org/pub/fedora/linux/releases/22/Cloud/x86_64/Images/Fedora-Cloud-Base-Vagrant-22-20150521.x86_64.vagrant-virtualbox.box diff --git a/tests/functional/centos/7/bs-journal-collocation/Vagrantfile b/tests/functional/centos/7/bs-journal-collocation/Vagrantfile deleted file mode 120000 index dfd7436c9..000000000 --- a/tests/functional/centos/7/bs-journal-collocation/Vagrantfile +++ /dev/null @@ -1 +0,0 @@ -../../../../../Vagrantfile \ No newline at end of file diff --git a/tests/functional/centos/7/bs-journal-collocation/group_vars/all b/tests/functional/centos/7/bs-journal-collocation/group_vars/all deleted file mode 100644 index a977c9dbf..000000000 --- a/tests/functional/centos/7/bs-journal-collocation/group_vars/all +++ /dev/null @@ -1,23 +0,0 @@ ---- - -ceph_stable: True -cluster: test -monitor_interface: eth1 -public_network: "192.168.3.0/24" -cluster_network: "192.168.4.0/24" -journal_size: 100 -devices: - - '/dev/sda' - - '/dev/sdb' -journal_collocation: True -osd_objectstore: "bluestore" -os_tuning_params: - - { name: kernel.pid_max, value: 4194303 } - - { name: fs.file-max, value: 26234859 } -ceph_conf_overrides: - global: - osd_pool_default_pg_num: 8 - osd_pool_default_size: 1 - osd: - bluestore block db size = 67108864 - bluestore block wal size = 1048576000 diff --git a/tests/functional/centos/7/bs-journal-collocation/group_vars/osds b/tests/functional/centos/7/bs-journal-collocation/group_vars/osds deleted file mode 100644 index ed9b23ad1..000000000 --- a/tests/functional/centos/7/bs-journal-collocation/group_vars/osds +++ /dev/null @@ -1,4 +0,0 @@ ---- -os_tuning_params: - - { name: kernel.pid_max, value: 4194303 } - - { name: fs.file-max, value: 26234859 } diff --git a/tests/functional/centos/7/bs-journal-collocation/hosts b/tests/functional/centos/7/bs-journal-collocation/hosts deleted file mode 100644 index 89721c03e..000000000 --- a/tests/functional/centos/7/bs-journal-collocation/hosts +++ /dev/null @@ -1,5 +0,0 @@ -[mons] -mon0 monitor_interface=eth1 - -[osds] -osd0 diff --git a/tests/functional/centos/7/bs-journal-collocation/vagrant_variables.yml b/tests/functional/centos/7/bs-journal-collocation/vagrant_variables.yml deleted file mode 100644 index 625cbe8ca..000000000 --- a/tests/functional/centos/7/bs-journal-collocation/vagrant_variables.yml +++ /dev/null @@ -1,77 +0,0 @@ ---- - -# DEPLOY CONTAINERIZED DAEMONS -docker: false - -# DEFINE THE NUMBER OF VMS TO RUN -mon_vms: 1 -osd_vms: 1 -mds_vms: 0 -rgw_vms: 0 -nfs_vms: 0 -rbd_mirror_vms: 0 -client_vms: 0 -iscsi_gw_vms: 0 -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.3 -cluster_subnet: 192.168.4 - -# MEMORY -# set 1024 for CentOS -memory: 512 - -# Ethernet interface name -# use eth1 for libvirt and ubuntu precise, enp0s8 for CentOS and ubuntu xenial -eth: 'eth1' - -# Disks -# For libvirt use disks: "[ '/dev/vdb', '/dev/vdc' ]" -# For CentOS7 use disks: "[ '/dev/sda', '/dev/sdb' ]" -disks: "[ '/dev/sdb', '/dev/sdc' ]" - -# VM disk size in MB -disk_size: 41000 - -# VAGRANT BOX -# Ceph boxes are *strongly* suggested. They are under better control and will -# not get updated frequently unless required for build systems. These are (for -# now): -# -# * ceph/ubuntu-xenial -# -# Ubuntu: ceph/ubuntu-xenial bento/ubuntu-16.04 or ubuntu/trusty64 or ubuntu/wily64 -# CentOS: bento/centos-7.1 or puppetlabs/centos-7.0-64-puppet -# libvirt CentOS: centos/7 -# parallels Ubuntu: parallels/ubuntu-14.04 -# Debian: deb/jessie-amd64 - be careful the storage controller is named 'SATA Controller' -# For more boxes have a look at: -# - https://atlas.hashicorp.com/boxes/search?utf8=✓&sort=&provider=virtualbox&q= -# - https://download.gluster.org/pub/gluster/purpleidea/vagrant/ -vagrant_box: centos/7 -#ssh_private_key_path: "~/.ssh/id_rsa" -# The sync directory changes based on vagrant box -# Set to /home/vagrant/sync for Centos/7, /home/{ user }/vagrant for openstack and defaults to /vagrant -#vagrant_sync_dir: /home/vagrant/sync -#vagrant_sync_dir: / -# Disables synced folder creation. Not needed for testing, will skip mounting -# the vagrant directory on the remote box regardless of the provider. -vagrant_disable_synced_folder: true -# VAGRANT URL -# This is a URL to download an image from an alternate location. vagrant_box -# above should be set to the filename of the image. -# Fedora virtualbox: https://download.fedoraproject.org/pub/fedora/linux/releases/22/Cloud/x86_64/Images/Fedora-Cloud-Base-Vagrant-22-20150521.x86_64.vagrant-virtualbox.box -# Fedora libvirt: https://download.fedoraproject.org/pub/fedora/linux/releases/22/Cloud/x86_64/Images/Fedora-Cloud-Base-Vagrant-22-20150521.x86_64.vagrant-libvirt.box -# vagrant_box_url: https://download.fedoraproject.org/pub/fedora/linux/releases/22/Cloud/x86_64/Images/Fedora-Cloud-Base-Vagrant-22-20150521.x86_64.vagrant-virtualbox.box - -os_tuning_params: - - { name: kernel.pid_max, value: 4194303 } - - { name: fs.file-max, value: 26234859 } diff --git a/tests/functional/centos/7/bs-jrn-col/Vagrantfile b/tests/functional/centos/7/bs-jrn-col/Vagrantfile new file mode 120000 index 000000000..dfd7436c9 --- /dev/null +++ b/tests/functional/centos/7/bs-jrn-col/Vagrantfile @@ -0,0 +1 @@ +../../../../../Vagrantfile \ No newline at end of file diff --git a/tests/functional/centos/7/bs-jrn-col/group_vars/all b/tests/functional/centos/7/bs-jrn-col/group_vars/all new file mode 100644 index 000000000..a977c9dbf --- /dev/null +++ b/tests/functional/centos/7/bs-jrn-col/group_vars/all @@ -0,0 +1,23 @@ +--- + +ceph_stable: True +cluster: test +monitor_interface: eth1 +public_network: "192.168.3.0/24" +cluster_network: "192.168.4.0/24" +journal_size: 100 +devices: + - '/dev/sda' + - '/dev/sdb' +journal_collocation: True +osd_objectstore: "bluestore" +os_tuning_params: + - { name: kernel.pid_max, value: 4194303 } + - { name: fs.file-max, value: 26234859 } +ceph_conf_overrides: + global: + osd_pool_default_pg_num: 8 + osd_pool_default_size: 1 + osd: + bluestore block db size = 67108864 + bluestore block wal size = 1048576000 diff --git a/tests/functional/centos/7/bs-jrn-col/group_vars/osds b/tests/functional/centos/7/bs-jrn-col/group_vars/osds new file mode 100644 index 000000000..ed9b23ad1 --- /dev/null +++ b/tests/functional/centos/7/bs-jrn-col/group_vars/osds @@ -0,0 +1,4 @@ +--- +os_tuning_params: + - { name: kernel.pid_max, value: 4194303 } + - { name: fs.file-max, value: 26234859 } diff --git a/tests/functional/centos/7/bs-jrn-col/hosts b/tests/functional/centos/7/bs-jrn-col/hosts new file mode 100644 index 000000000..89721c03e --- /dev/null +++ b/tests/functional/centos/7/bs-jrn-col/hosts @@ -0,0 +1,5 @@ +[mons] +mon0 monitor_interface=eth1 + +[osds] +osd0 diff --git a/tests/functional/centos/7/bs-jrn-col/vagrant_variables.yml b/tests/functional/centos/7/bs-jrn-col/vagrant_variables.yml new file mode 100644 index 000000000..625cbe8ca --- /dev/null +++ b/tests/functional/centos/7/bs-jrn-col/vagrant_variables.yml @@ -0,0 +1,77 @@ +--- + +# DEPLOY CONTAINERIZED DAEMONS +docker: false + +# DEFINE THE NUMBER OF VMS TO RUN +mon_vms: 1 +osd_vms: 1 +mds_vms: 0 +rgw_vms: 0 +nfs_vms: 0 +rbd_mirror_vms: 0 +client_vms: 0 +iscsi_gw_vms: 0 +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.3 +cluster_subnet: 192.168.4 + +# MEMORY +# set 1024 for CentOS +memory: 512 + +# Ethernet interface name +# use eth1 for libvirt and ubuntu precise, enp0s8 for CentOS and ubuntu xenial +eth: 'eth1' + +# Disks +# For libvirt use disks: "[ '/dev/vdb', '/dev/vdc' ]" +# For CentOS7 use disks: "[ '/dev/sda', '/dev/sdb' ]" +disks: "[ '/dev/sdb', '/dev/sdc' ]" + +# VM disk size in MB +disk_size: 41000 + +# VAGRANT BOX +# Ceph boxes are *strongly* suggested. They are under better control and will +# not get updated frequently unless required for build systems. These are (for +# now): +# +# * ceph/ubuntu-xenial +# +# Ubuntu: ceph/ubuntu-xenial bento/ubuntu-16.04 or ubuntu/trusty64 or ubuntu/wily64 +# CentOS: bento/centos-7.1 or puppetlabs/centos-7.0-64-puppet +# libvirt CentOS: centos/7 +# parallels Ubuntu: parallels/ubuntu-14.04 +# Debian: deb/jessie-amd64 - be careful the storage controller is named 'SATA Controller' +# For more boxes have a look at: +# - https://atlas.hashicorp.com/boxes/search?utf8=✓&sort=&provider=virtualbox&q= +# - https://download.gluster.org/pub/gluster/purpleidea/vagrant/ +vagrant_box: centos/7 +#ssh_private_key_path: "~/.ssh/id_rsa" +# The sync directory changes based on vagrant box +# Set to /home/vagrant/sync for Centos/7, /home/{ user }/vagrant for openstack and defaults to /vagrant +#vagrant_sync_dir: /home/vagrant/sync +#vagrant_sync_dir: / +# Disables synced folder creation. Not needed for testing, will skip mounting +# the vagrant directory on the remote box regardless of the provider. +vagrant_disable_synced_folder: true +# VAGRANT URL +# This is a URL to download an image from an alternate location. vagrant_box +# above should be set to the filename of the image. +# Fedora virtualbox: https://download.fedoraproject.org/pub/fedora/linux/releases/22/Cloud/x86_64/Images/Fedora-Cloud-Base-Vagrant-22-20150521.x86_64.vagrant-virtualbox.box +# Fedora libvirt: https://download.fedoraproject.org/pub/fedora/linux/releases/22/Cloud/x86_64/Images/Fedora-Cloud-Base-Vagrant-22-20150521.x86_64.vagrant-libvirt.box +# vagrant_box_url: https://download.fedoraproject.org/pub/fedora/linux/releases/22/Cloud/x86_64/Images/Fedora-Cloud-Base-Vagrant-22-20150521.x86_64.vagrant-virtualbox.box + +os_tuning_params: + - { name: kernel.pid_max, value: 4194303 } + - { name: fs.file-max, value: 26234859 } diff --git a/tests/functional/centos/7/crypt-ded-jrn/Vagrantfile b/tests/functional/centos/7/crypt-ded-jrn/Vagrantfile new file mode 120000 index 000000000..dfd7436c9 --- /dev/null +++ b/tests/functional/centos/7/crypt-ded-jrn/Vagrantfile @@ -0,0 +1 @@ +../../../../../Vagrantfile \ No newline at end of file diff --git a/tests/functional/centos/7/crypt-ded-jrn/group_vars/all b/tests/functional/centos/7/crypt-ded-jrn/group_vars/all new file mode 100644 index 000000000..6313dcac6 --- /dev/null +++ b/tests/functional/centos/7/crypt-ded-jrn/group_vars/all @@ -0,0 +1,20 @@ +--- + +ceph_stable: True +public_network: "192.168.11.0/24" +cluster_network: "192.168.12.0/24" +journal_size: 100 +monitor_interface: eth1 +dmcrypt_dedicated_journal: true +osd_objectstore: "filestore" +devices: + - '/dev/sda' +raw_journal_devices: + - '/dev/sdb' +os_tuning_params: + - { name: kernel.pid_max, value: 4194303 } + - { name: fs.file-max, value: 26234859 } +ceph_conf_overrides: + global: + osd_pool_default_pg_num: 8 + osd_pool_default_size: 1 diff --git a/tests/functional/centos/7/crypt-ded-jrn/group_vars/osds b/tests/functional/centos/7/crypt-ded-jrn/group_vars/osds new file mode 100644 index 000000000..ed9b23ad1 --- /dev/null +++ b/tests/functional/centos/7/crypt-ded-jrn/group_vars/osds @@ -0,0 +1,4 @@ +--- +os_tuning_params: + - { name: kernel.pid_max, value: 4194303 } + - { name: fs.file-max, value: 26234859 } diff --git a/tests/functional/centos/7/crypt-ded-jrn/hosts b/tests/functional/centos/7/crypt-ded-jrn/hosts new file mode 100644 index 000000000..f6a265ab3 --- /dev/null +++ b/tests/functional/centos/7/crypt-ded-jrn/hosts @@ -0,0 +1,5 @@ +[mons] +mon0 + +[osds] +osd0 diff --git a/tests/functional/centos/7/crypt-ded-jrn/vagrant_variables.yml b/tests/functional/centos/7/crypt-ded-jrn/vagrant_variables.yml new file mode 100644 index 000000000..8a8fb891d --- /dev/null +++ b/tests/functional/centos/7/crypt-ded-jrn/vagrant_variables.yml @@ -0,0 +1,74 @@ +--- + +# DEPLOY CONTAINERIZED DAEMONS +docker: false + +# DEFINE THE NUMBER OF VMS TO RUN +mon_vms: 1 +osd_vms: 1 +mds_vms: 0 +rgw_vms: 0 +nfs_vms: 0 +rbd_mirror_vms: 0 +client_vms: 0 +iscsi_gw_vms: 0 +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.11 +cluster_subnet: 192.168.12 + +# MEMORY +# set 1024 for CentOS +memory: 512 + +# Ethernet interface name +# use eth1 for libvirt and ubuntu precise, enp0s8 for CentOS and ubuntu xenial +eth: 'eth1' + +# Disks +# For libvirt use disks: "[ '/dev/vdb', '/dev/vdc' ]" +# For CentOS7 use disks: "[ '/dev/sda', '/dev/sdb' ]" +disks: "[ '/dev/sdb', '/dev/sdc' ]" + +# VAGRANT BOX +# Ceph boxes are *strongly* suggested. They are under better control and will +# not get updated frequently unless required for build systems. These are (for +# now): +# +# * ceph/ubuntu-xenial +# +# Ubuntu: ceph/ubuntu-xenial bento/ubuntu-16.04 or ubuntu/trusty64 or ubuntu/wily64 +# CentOS: bento/centos-7.1 or puppetlabs/centos-7.0-64-puppet +# libvirt CentOS: centos/7 +# parallels Ubuntu: parallels/ubuntu-14.04 +# Debian: deb/jessie-amd64 - be careful the storage controller is named 'SATA Controller' +# For more boxes have a look at: +# - https://atlas.hashicorp.com/boxes/search?utf8=✓&sort=&provider=virtualbox&q= +# - https://download.gluster.org/pub/gluster/purpleidea/vagrant/ +vagrant_box: centos/7 +#ssh_private_key_path: "~/.ssh/id_rsa" +# The sync directory changes based on vagrant box +# Set to /home/vagrant/sync for Centos/7, /home/{ user }/vagrant for openstack and defaults to /vagrant +#vagrant_sync_dir: /home/vagrant/sync +#vagrant_sync_dir: / +# Disables synced folder creation. Not needed for testing, will skip mounting +# the vagrant directory on the remote box regardless of the provider. +vagrant_disable_synced_folder: true +# VAGRANT URL +# This is a URL to download an image from an alternate location. vagrant_box +# above should be set to the filename of the image. +# Fedora virtualbox: https://download.fedoraproject.org/pub/fedora/linux/releases/22/Cloud/x86_64/Images/Fedora-Cloud-Base-Vagrant-22-20150521.x86_64.vagrant-virtualbox.box +# Fedora libvirt: https://download.fedoraproject.org/pub/fedora/linux/releases/22/Cloud/x86_64/Images/Fedora-Cloud-Base-Vagrant-22-20150521.x86_64.vagrant-libvirt.box +# vagrant_box_url: https://download.fedoraproject.org/pub/fedora/linux/releases/22/Cloud/x86_64/Images/Fedora-Cloud-Base-Vagrant-22-20150521.x86_64.vagrant-virtualbox.box + +os_tuning_params: + - { name: kernel.pid_max, value: 4194303 } + - { name: fs.file-max, value: 26234859 } diff --git a/tests/functional/centos/7/crypt-jrn-col/Vagrantfile b/tests/functional/centos/7/crypt-jrn-col/Vagrantfile new file mode 120000 index 000000000..dfd7436c9 --- /dev/null +++ b/tests/functional/centos/7/crypt-jrn-col/Vagrantfile @@ -0,0 +1 @@ +../../../../../Vagrantfile \ No newline at end of file diff --git a/tests/functional/centos/7/crypt-jrn-col/group_vars/all b/tests/functional/centos/7/crypt-jrn-col/group_vars/all new file mode 100644 index 000000000..a4d740c39 --- /dev/null +++ b/tests/functional/centos/7/crypt-jrn-col/group_vars/all @@ -0,0 +1,19 @@ +--- + +ceph_stable: True +public_network: "192.168.13.0/24" +cluster_network: "192.168.14.0/24" +journal_size: 100 +monitor_interface: eth1 +dmcrypt_journal_collocation: true +osd_objectstore: "filestore" +devices: + - '/dev/sda' + - '/dev/sdb' +os_tuning_params: + - { name: kernel.pid_max, value: 4194303 } + - { name: fs.file-max, value: 26234859 } +ceph_conf_overrides: + global: + osd_pool_default_pg_num: 8 + osd_pool_default_size: 1 diff --git a/tests/functional/centos/7/crypt-jrn-col/group_vars/osds b/tests/functional/centos/7/crypt-jrn-col/group_vars/osds new file mode 100644 index 000000000..ed9b23ad1 --- /dev/null +++ b/tests/functional/centos/7/crypt-jrn-col/group_vars/osds @@ -0,0 +1,4 @@ +--- +os_tuning_params: + - { name: kernel.pid_max, value: 4194303 } + - { name: fs.file-max, value: 26234859 } diff --git a/tests/functional/centos/7/crypt-jrn-col/hosts b/tests/functional/centos/7/crypt-jrn-col/hosts new file mode 100644 index 000000000..f6a265ab3 --- /dev/null +++ b/tests/functional/centos/7/crypt-jrn-col/hosts @@ -0,0 +1,5 @@ +[mons] +mon0 + +[osds] +osd0 diff --git a/tests/functional/centos/7/crypt-jrn-col/vagrant_variables.yml b/tests/functional/centos/7/crypt-jrn-col/vagrant_variables.yml new file mode 100644 index 000000000..33ff53f7a --- /dev/null +++ b/tests/functional/centos/7/crypt-jrn-col/vagrant_variables.yml @@ -0,0 +1,74 @@ +--- + +# DEPLOY CONTAINERIZED DAEMONS +docker: false + +# DEFINE THE NUMBER OF VMS TO RUN +mon_vms: 1 +osd_vms: 1 +mds_vms: 0 +rgw_vms: 0 +nfs_vms: 0 +rbd_mirror_vms: 0 +client_vms: 0 +iscsi_gw_vms: 0 +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.13 +cluster_subnet: 192.168.14 + +# MEMORY +# set 1024 for CentOS +memory: 512 + +# Ethernet interface name +# use eth1 for libvirt and ubuntu precise, enp0s8 for CentOS and ubuntu xenial +eth: 'eth1' + +# Disks +# For libvirt use disks: "[ '/dev/vdb', '/dev/vdc' ]" +# For CentOS7 use disks: "[ '/dev/sda', '/dev/sdb' ]" +disks: "[ '/dev/sdb', '/dev/sdc' ]" + +# VAGRANT BOX +# Ceph boxes are *strongly* suggested. They are under better control and will +# not get updated frequently unless required for build systems. These are (for +# now): +# +# * ceph/ubuntu-xenial +# +# Ubuntu: ceph/ubuntu-xenial bento/ubuntu-16.04 or ubuntu/trusty64 or ubuntu/wily64 +# CentOS: bento/centos-7.1 or puppetlabs/centos-7.0-64-puppet +# libvirt CentOS: centos/7 +# parallels Ubuntu: parallels/ubuntu-14.04 +# Debian: deb/jessie-amd64 - be careful the storage controller is named 'SATA Controller' +# For more boxes have a look at: +# - https://atlas.hashicorp.com/boxes/search?utf8=✓&sort=&provider=virtualbox&q= +# - https://download.gluster.org/pub/gluster/purpleidea/vagrant/ +vagrant_box: centos/7 +#ssh_private_key_path: "~/.ssh/id_rsa" +# The sync directory changes based on vagrant box +# Set to /home/vagrant/sync for Centos/7, /home/{ user }/vagrant for openstack and defaults to /vagrant +#vagrant_sync_dir: /home/vagrant/sync +#vagrant_sync_dir: / +# Disables synced folder creation. Not needed for testing, will skip mounting +# the vagrant directory on the remote box regardless of the provider. +vagrant_disable_synced_folder: true +# VAGRANT URL +# This is a URL to download an image from an alternate location. vagrant_box +# above should be set to the filename of the image. +# Fedora virtualbox: https://download.fedoraproject.org/pub/fedora/linux/releases/22/Cloud/x86_64/Images/Fedora-Cloud-Base-Vagrant-22-20150521.x86_64.vagrant-virtualbox.box +# Fedora libvirt: https://download.fedoraproject.org/pub/fedora/linux/releases/22/Cloud/x86_64/Images/Fedora-Cloud-Base-Vagrant-22-20150521.x86_64.vagrant-libvirt.box +# vagrant_box_url: https://download.fedoraproject.org/pub/fedora/linux/releases/22/Cloud/x86_64/Images/Fedora-Cloud-Base-Vagrant-22-20150521.x86_64.vagrant-virtualbox.box + +os_tuning_params: + - { name: kernel.pid_max, value: 4194303 } + - { name: fs.file-max, value: 26234859 } diff --git a/tests/functional/centos/7/dmcrypt-dedicated-journal/Vagrantfile b/tests/functional/centos/7/dmcrypt-dedicated-journal/Vagrantfile deleted file mode 120000 index dfd7436c9..000000000 --- a/tests/functional/centos/7/dmcrypt-dedicated-journal/Vagrantfile +++ /dev/null @@ -1 +0,0 @@ -../../../../../Vagrantfile \ No newline at end of file diff --git a/tests/functional/centos/7/dmcrypt-dedicated-journal/group_vars/all b/tests/functional/centos/7/dmcrypt-dedicated-journal/group_vars/all deleted file mode 100644 index 6313dcac6..000000000 --- a/tests/functional/centos/7/dmcrypt-dedicated-journal/group_vars/all +++ /dev/null @@ -1,20 +0,0 @@ ---- - -ceph_stable: True -public_network: "192.168.11.0/24" -cluster_network: "192.168.12.0/24" -journal_size: 100 -monitor_interface: eth1 -dmcrypt_dedicated_journal: true -osd_objectstore: "filestore" -devices: - - '/dev/sda' -raw_journal_devices: - - '/dev/sdb' -os_tuning_params: - - { name: kernel.pid_max, value: 4194303 } - - { name: fs.file-max, value: 26234859 } -ceph_conf_overrides: - global: - osd_pool_default_pg_num: 8 - osd_pool_default_size: 1 diff --git a/tests/functional/centos/7/dmcrypt-dedicated-journal/group_vars/osds b/tests/functional/centos/7/dmcrypt-dedicated-journal/group_vars/osds deleted file mode 100644 index ed9b23ad1..000000000 --- a/tests/functional/centos/7/dmcrypt-dedicated-journal/group_vars/osds +++ /dev/null @@ -1,4 +0,0 @@ ---- -os_tuning_params: - - { name: kernel.pid_max, value: 4194303 } - - { name: fs.file-max, value: 26234859 } diff --git a/tests/functional/centos/7/dmcrypt-dedicated-journal/hosts b/tests/functional/centos/7/dmcrypt-dedicated-journal/hosts deleted file mode 100644 index f6a265ab3..000000000 --- a/tests/functional/centos/7/dmcrypt-dedicated-journal/hosts +++ /dev/null @@ -1,5 +0,0 @@ -[mons] -mon0 - -[osds] -osd0 diff --git a/tests/functional/centos/7/dmcrypt-dedicated-journal/vagrant_variables.yml b/tests/functional/centos/7/dmcrypt-dedicated-journal/vagrant_variables.yml deleted file mode 100644 index 8a8fb891d..000000000 --- a/tests/functional/centos/7/dmcrypt-dedicated-journal/vagrant_variables.yml +++ /dev/null @@ -1,74 +0,0 @@ ---- - -# DEPLOY CONTAINERIZED DAEMONS -docker: false - -# DEFINE THE NUMBER OF VMS TO RUN -mon_vms: 1 -osd_vms: 1 -mds_vms: 0 -rgw_vms: 0 -nfs_vms: 0 -rbd_mirror_vms: 0 -client_vms: 0 -iscsi_gw_vms: 0 -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.11 -cluster_subnet: 192.168.12 - -# MEMORY -# set 1024 for CentOS -memory: 512 - -# Ethernet interface name -# use eth1 for libvirt and ubuntu precise, enp0s8 for CentOS and ubuntu xenial -eth: 'eth1' - -# Disks -# For libvirt use disks: "[ '/dev/vdb', '/dev/vdc' ]" -# For CentOS7 use disks: "[ '/dev/sda', '/dev/sdb' ]" -disks: "[ '/dev/sdb', '/dev/sdc' ]" - -# VAGRANT BOX -# Ceph boxes are *strongly* suggested. They are under better control and will -# not get updated frequently unless required for build systems. These are (for -# now): -# -# * ceph/ubuntu-xenial -# -# Ubuntu: ceph/ubuntu-xenial bento/ubuntu-16.04 or ubuntu/trusty64 or ubuntu/wily64 -# CentOS: bento/centos-7.1 or puppetlabs/centos-7.0-64-puppet -# libvirt CentOS: centos/7 -# parallels Ubuntu: parallels/ubuntu-14.04 -# Debian: deb/jessie-amd64 - be careful the storage controller is named 'SATA Controller' -# For more boxes have a look at: -# - https://atlas.hashicorp.com/boxes/search?utf8=✓&sort=&provider=virtualbox&q= -# - https://download.gluster.org/pub/gluster/purpleidea/vagrant/ -vagrant_box: centos/7 -#ssh_private_key_path: "~/.ssh/id_rsa" -# The sync directory changes based on vagrant box -# Set to /home/vagrant/sync for Centos/7, /home/{ user }/vagrant for openstack and defaults to /vagrant -#vagrant_sync_dir: /home/vagrant/sync -#vagrant_sync_dir: / -# Disables synced folder creation. Not needed for testing, will skip mounting -# the vagrant directory on the remote box regardless of the provider. -vagrant_disable_synced_folder: true -# VAGRANT URL -# This is a URL to download an image from an alternate location. vagrant_box -# above should be set to the filename of the image. -# Fedora virtualbox: https://download.fedoraproject.org/pub/fedora/linux/releases/22/Cloud/x86_64/Images/Fedora-Cloud-Base-Vagrant-22-20150521.x86_64.vagrant-virtualbox.box -# Fedora libvirt: https://download.fedoraproject.org/pub/fedora/linux/releases/22/Cloud/x86_64/Images/Fedora-Cloud-Base-Vagrant-22-20150521.x86_64.vagrant-libvirt.box -# vagrant_box_url: https://download.fedoraproject.org/pub/fedora/linux/releases/22/Cloud/x86_64/Images/Fedora-Cloud-Base-Vagrant-22-20150521.x86_64.vagrant-virtualbox.box - -os_tuning_params: - - { name: kernel.pid_max, value: 4194303 } - - { name: fs.file-max, value: 26234859 } diff --git a/tests/functional/centos/7/dmcrypt-journal-collocation/Vagrantfile b/tests/functional/centos/7/dmcrypt-journal-collocation/Vagrantfile deleted file mode 120000 index dfd7436c9..000000000 --- a/tests/functional/centos/7/dmcrypt-journal-collocation/Vagrantfile +++ /dev/null @@ -1 +0,0 @@ -../../../../../Vagrantfile \ No newline at end of file diff --git a/tests/functional/centos/7/dmcrypt-journal-collocation/group_vars/all b/tests/functional/centos/7/dmcrypt-journal-collocation/group_vars/all deleted file mode 100644 index a4d740c39..000000000 --- a/tests/functional/centos/7/dmcrypt-journal-collocation/group_vars/all +++ /dev/null @@ -1,19 +0,0 @@ ---- - -ceph_stable: True -public_network: "192.168.13.0/24" -cluster_network: "192.168.14.0/24" -journal_size: 100 -monitor_interface: eth1 -dmcrypt_journal_collocation: true -osd_objectstore: "filestore" -devices: - - '/dev/sda' - - '/dev/sdb' -os_tuning_params: - - { name: kernel.pid_max, value: 4194303 } - - { name: fs.file-max, value: 26234859 } -ceph_conf_overrides: - global: - osd_pool_default_pg_num: 8 - osd_pool_default_size: 1 diff --git a/tests/functional/centos/7/dmcrypt-journal-collocation/group_vars/osds b/tests/functional/centos/7/dmcrypt-journal-collocation/group_vars/osds deleted file mode 100644 index ed9b23ad1..000000000 --- a/tests/functional/centos/7/dmcrypt-journal-collocation/group_vars/osds +++ /dev/null @@ -1,4 +0,0 @@ ---- -os_tuning_params: - - { name: kernel.pid_max, value: 4194303 } - - { name: fs.file-max, value: 26234859 } diff --git a/tests/functional/centos/7/dmcrypt-journal-collocation/hosts b/tests/functional/centos/7/dmcrypt-journal-collocation/hosts deleted file mode 100644 index f6a265ab3..000000000 --- a/tests/functional/centos/7/dmcrypt-journal-collocation/hosts +++ /dev/null @@ -1,5 +0,0 @@ -[mons] -mon0 - -[osds] -osd0 diff --git a/tests/functional/centos/7/dmcrypt-journal-collocation/vagrant_variables.yml b/tests/functional/centos/7/dmcrypt-journal-collocation/vagrant_variables.yml deleted file mode 100644 index 33ff53f7a..000000000 --- a/tests/functional/centos/7/dmcrypt-journal-collocation/vagrant_variables.yml +++ /dev/null @@ -1,74 +0,0 @@ ---- - -# DEPLOY CONTAINERIZED DAEMONS -docker: false - -# DEFINE THE NUMBER OF VMS TO RUN -mon_vms: 1 -osd_vms: 1 -mds_vms: 0 -rgw_vms: 0 -nfs_vms: 0 -rbd_mirror_vms: 0 -client_vms: 0 -iscsi_gw_vms: 0 -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.13 -cluster_subnet: 192.168.14 - -# MEMORY -# set 1024 for CentOS -memory: 512 - -# Ethernet interface name -# use eth1 for libvirt and ubuntu precise, enp0s8 for CentOS and ubuntu xenial -eth: 'eth1' - -# Disks -# For libvirt use disks: "[ '/dev/vdb', '/dev/vdc' ]" -# For CentOS7 use disks: "[ '/dev/sda', '/dev/sdb' ]" -disks: "[ '/dev/sdb', '/dev/sdc' ]" - -# VAGRANT BOX -# Ceph boxes are *strongly* suggested. They are under better control and will -# not get updated frequently unless required for build systems. These are (for -# now): -# -# * ceph/ubuntu-xenial -# -# Ubuntu: ceph/ubuntu-xenial bento/ubuntu-16.04 or ubuntu/trusty64 or ubuntu/wily64 -# CentOS: bento/centos-7.1 or puppetlabs/centos-7.0-64-puppet -# libvirt CentOS: centos/7 -# parallels Ubuntu: parallels/ubuntu-14.04 -# Debian: deb/jessie-amd64 - be careful the storage controller is named 'SATA Controller' -# For more boxes have a look at: -# - https://atlas.hashicorp.com/boxes/search?utf8=✓&sort=&provider=virtualbox&q= -# - https://download.gluster.org/pub/gluster/purpleidea/vagrant/ -vagrant_box: centos/7 -#ssh_private_key_path: "~/.ssh/id_rsa" -# The sync directory changes based on vagrant box -# Set to /home/vagrant/sync for Centos/7, /home/{ user }/vagrant for openstack and defaults to /vagrant -#vagrant_sync_dir: /home/vagrant/sync -#vagrant_sync_dir: / -# Disables synced folder creation. Not needed for testing, will skip mounting -# the vagrant directory on the remote box regardless of the provider. -vagrant_disable_synced_folder: true -# VAGRANT URL -# This is a URL to download an image from an alternate location. vagrant_box -# above should be set to the filename of the image. -# Fedora virtualbox: https://download.fedoraproject.org/pub/fedora/linux/releases/22/Cloud/x86_64/Images/Fedora-Cloud-Base-Vagrant-22-20150521.x86_64.vagrant-virtualbox.box -# Fedora libvirt: https://download.fedoraproject.org/pub/fedora/linux/releases/22/Cloud/x86_64/Images/Fedora-Cloud-Base-Vagrant-22-20150521.x86_64.vagrant-libvirt.box -# vagrant_box_url: https://download.fedoraproject.org/pub/fedora/linux/releases/22/Cloud/x86_64/Images/Fedora-Cloud-Base-Vagrant-22-20150521.x86_64.vagrant-virtualbox.box - -os_tuning_params: - - { name: kernel.pid_max, value: 4194303 } - - { name: fs.file-max, value: 26234859 } diff --git a/tests/functional/centos/7/docker-cluster-dedicated-journal/Vagrantfile b/tests/functional/centos/7/docker-cluster-dedicated-journal/Vagrantfile deleted file mode 120000 index dfd7436c9..000000000 --- a/tests/functional/centos/7/docker-cluster-dedicated-journal/Vagrantfile +++ /dev/null @@ -1 +0,0 @@ -../../../../../Vagrantfile \ No newline at end of file diff --git a/tests/functional/centos/7/docker-cluster-dedicated-journal/group_vars/all b/tests/functional/centos/7/docker-cluster-dedicated-journal/group_vars/all deleted file mode 100644 index 8bb92b26b..000000000 --- a/tests/functional/centos/7/docker-cluster-dedicated-journal/group_vars/all +++ /dev/null @@ -1,22 +0,0 @@ ---- -# this is only here to let the CI tests know -# that this scenario is using docker -docker: True - -ceph_stable: True -containerized_deployment: True -cluster: test -monitor_interface: eth1 -ceph_mon_docker_subnet: "{{ public_network }}" -journal_size: 100 -ceph_docker_on_openstack: False -public_network: "192.168.15.0/24" -cluster_network: "192.168.16.0/24" -ceph_rgw_civetweb_port: 8080 -ceph_osd_docker_devices: "{{ devices }}" -devices: - - /dev/sda -raw_journal_devices: - - /dev/sdb -ceph_osd_docker_prepare_env: -e CLUSTER={{ cluster }} -e OSD_JOURNAL_SIZE={{ journal_size }} -e OSD_FORCE_ZAP=1 -e OSD_JOURNAL={{ raw_journal_devices[0] }} -ceph_osd_docker_run_script_path: /var/tmp diff --git a/tests/functional/centos/7/docker-cluster-dedicated-journal/hosts b/tests/functional/centos/7/docker-cluster-dedicated-journal/hosts deleted file mode 100644 index f6a265ab3..000000000 --- a/tests/functional/centos/7/docker-cluster-dedicated-journal/hosts +++ /dev/null @@ -1,5 +0,0 @@ -[mons] -mon0 - -[osds] -osd0 diff --git a/tests/functional/centos/7/docker-cluster-dedicated-journal/vagrant_variables.yml b/tests/functional/centos/7/docker-cluster-dedicated-journal/vagrant_variables.yml deleted file mode 100644 index aa03b197c..000000000 --- a/tests/functional/centos/7/docker-cluster-dedicated-journal/vagrant_variables.yml +++ /dev/null @@ -1,52 +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 - -# SUBNETS TO USE FOR THE VMS -public_subnet: 192.168.15 -cluster_subnet: 192.168.16 - -# 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 -# -# NOTE(leseb): we use centos for this scenario since we at least need Docker version 1.12.5 -# which is not available in Atomic Host. -# There are bug like this one: https://github.com/docker/docker/issues/12694 -vagrant_box: centos/7 - -#ssh_private_key_path: "~/.ssh/id_rsa" -# The sync directory changes based on vagrant box -# Set to /home/vagrant/sync for Centos/7, /home/{ user }/vagrant for openstack and defaults to /vagrant -#vagrant_sync_dir: /home/vagrant/sync -#vagrant_sync_dir: / -# Disables synced folder creation. Not needed for testing, will skip mounting -# the vagrant directory on the remote box regardless of the provider. -vagrant_disable_synced_folder: true diff --git a/tests/functional/centos/7/docker-cluster-dmcrypt-journal-collocation/Vagrantfile b/tests/functional/centos/7/docker-cluster-dmcrypt-journal-collocation/Vagrantfile deleted file mode 120000 index dfd7436c9..000000000 --- a/tests/functional/centos/7/docker-cluster-dmcrypt-journal-collocation/Vagrantfile +++ /dev/null @@ -1 +0,0 @@ -../../../../../Vagrantfile \ No newline at end of file diff --git a/tests/functional/centos/7/docker-cluster-dmcrypt-journal-collocation/group_vars/all b/tests/functional/centos/7/docker-cluster-dmcrypt-journal-collocation/group_vars/all deleted file mode 100644 index 2af26d451..000000000 --- a/tests/functional/centos/7/docker-cluster-dmcrypt-journal-collocation/group_vars/all +++ /dev/null @@ -1,22 +0,0 @@ ---- -# this is only here to let the CI tests know -# that this scenario is using docker -docker: True - -ceph_stable: True -containerized_deployment: True -cluster: ceph -monitor_interface: eth1 -ceph_mon_docker_subnet: "{{ public_network }}" -journal_size: 100 -ceph_docker_on_openstack: False -public_network: "192.168.15.0/24" -cluster_network: "192.168.16.0/24" -dmcrypt_journal_collocation: true -ceph_rgw_civetweb_port: 8080 -ceph_osd_docker_devices: "{{ devices }}" -devices: - - /dev/sda - - /dev/sdb -ceph_osd_docker_prepare_env: -e CLUSTER={{ cluster }} -e OSD_JOURNAL_SIZE={{ journal_size }} -e OSD_FORCE_ZAP=1 -e OSD_DMCRYPT=1 -ceph_osd_docker_extra_env: -e CLUSTER={{ cluster }} -e CEPH_DAEMON=OSD_CEPH_DISK_ACTIVATE -e OSD_JOURNAL_SIZE={{ journal_size }} -e OSD_DMCRYPT=1 diff --git a/tests/functional/centos/7/docker-cluster-dmcrypt-journal-collocation/hosts b/tests/functional/centos/7/docker-cluster-dmcrypt-journal-collocation/hosts deleted file mode 100644 index f6a265ab3..000000000 --- a/tests/functional/centos/7/docker-cluster-dmcrypt-journal-collocation/hosts +++ /dev/null @@ -1,5 +0,0 @@ -[mons] -mon0 - -[osds] -osd0 diff --git a/tests/functional/centos/7/docker-cluster-dmcrypt-journal-collocation/vagrant_variables.yml b/tests/functional/centos/7/docker-cluster-dmcrypt-journal-collocation/vagrant_variables.yml deleted file mode 100644 index aa03b197c..000000000 --- a/tests/functional/centos/7/docker-cluster-dmcrypt-journal-collocation/vagrant_variables.yml +++ /dev/null @@ -1,52 +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 - -# SUBNETS TO USE FOR THE VMS -public_subnet: 192.168.15 -cluster_subnet: 192.168.16 - -# 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 -# -# NOTE(leseb): we use centos for this scenario since we at least need Docker version 1.12.5 -# which is not available in Atomic Host. -# There are bug like this one: https://github.com/docker/docker/issues/12694 -vagrant_box: centos/7 - -#ssh_private_key_path: "~/.ssh/id_rsa" -# The sync directory changes based on vagrant box -# Set to /home/vagrant/sync for Centos/7, /home/{ user }/vagrant for openstack and defaults to /vagrant -#vagrant_sync_dir: /home/vagrant/sync -#vagrant_sync_dir: / -# Disables synced folder creation. Not needed for testing, will skip mounting -# the vagrant directory on the remote box regardless of the provider. -vagrant_disable_synced_folder: true diff --git a/tests/functional/centos/7/docker-cluster/Vagrantfile b/tests/functional/centos/7/docker-cluster/Vagrantfile deleted file mode 120000 index dfd7436c9..000000000 --- a/tests/functional/centos/7/docker-cluster/Vagrantfile +++ /dev/null @@ -1 +0,0 @@ -../../../../../Vagrantfile \ No newline at end of file diff --git a/tests/functional/centos/7/docker-cluster/group_vars/all b/tests/functional/centos/7/docker-cluster/group_vars/all deleted file mode 100644 index 663b7dc24..000000000 --- a/tests/functional/centos/7/docker-cluster/group_vars/all +++ /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_stable: True -containerized_deployment: True -cluster: test -monitor_interface: eth1 -ceph_mon_docker_subnet: "{{ public_network }}" -journal_size: 100 -ceph_docker_on_openstack: False -public_network: "192.168.15.0/24" -cluster_network: "192.168.16.0/24" -journal_collocation: true -ceph_rgw_civetweb_port: 8080 -ceph_osd_docker_devices: "{{ devices }}" -ceph_osd_docker_prepare_env: -e CLUSTER={{ cluster }} -e OSD_JOURNAL_SIZE={{ journal_size }} -e OSD_FORCE_ZAP=1 -ceph_osd_docker_extra_env: -e CLUSTER={{ cluster }} -e CEPH_DAEMON=OSD_CEPH_DISK_ACTIVATE -devices: - - /dev/sda - - /dev/sdb -ceph_osd_docker_run_script_path: /var/tmp -rgw_override_bucket_index_max_shards: 16 -rgw_bucket_default_quota_max_objects: 1638400 -ceph_conf_overrides: - global: - osd_pool_default_pg_num: 8 - osd_pool_default_size: 1 diff --git a/tests/functional/centos/7/docker-cluster/hosts b/tests/functional/centos/7/docker-cluster/hosts deleted file mode 100644 index 2d684367d..000000000 --- a/tests/functional/centos/7/docker-cluster/hosts +++ /dev/null @@ -1,16 +0,0 @@ -[mons] -mon0 -mon1 -mon2 - -[osds] -osd0 - -[mdss] -mds0 - -[rgws] -rgw0 - -[mgrs] -mgr0 diff --git a/tests/functional/centos/7/docker-cluster/vagrant_variables.yml b/tests/functional/centos/7/docker-cluster/vagrant_variables.yml deleted file mode 100644 index 5c4d1081f..000000000 --- a/tests/functional/centos/7/docker-cluster/vagrant_variables.yml +++ /dev/null @@ -1,62 +0,0 @@ ---- - -# DEPLOY CONTAINERIZED DAEMONS -docker: True - -# DEFINE THE NUMBER OF VMS TO RUN -mon_vms: 3 -osd_vms: 1 -mds_vms: 1 -rgw_vms: 1 -nfs_vms: 0 -rbd_mirror_vms: 1 -client_vms: 0 -iscsi_gw_vms: 0 -mgr_vms: 1 - -# Deploy RESTAPI on each of the Monitors -restapi: true - -# SUBNETS TO USE FOR THE VMS -public_subnet: 192.168.15 -cluster_subnet: 192.168.16 - -# 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 -#ssh_private_key_path: "~/.ssh/id_rsa" -# The sync directory changes based on vagrant box -# Set to /home/vagrant/sync for Centos/7, /home/{ user }/vagrant for openstack and defaults to /vagrant -#vagrant_sync_dir: /home/vagrant/sync -#vagrant_sync_dir: / -# Disables synced folder creation. Not needed for testing, will skip mounting -# the vagrant directory on the remote box regardless of the provider. -vagrant_disable_synced_folder: true -# VAGRANT URL -# This is a URL to download an image from an alternate location. vagrant_box -# above should be set to the filename of the image. -# Fedora virtualbox: https://download.fedoraproject.org/pub/fedora/linux/releases/22/Cloud/x86_64/Images/Fedora-Cloud-Base-Vagrant-22-20150521.x86_64.vagrant-virtualbox.box -# Fedora libvirt: https://download.fedoraproject.org/pub/fedora/linux/releases/22/Cloud/x86_64/Images/Fedora-Cloud-Base-Vagrant-22-20150521.x86_64.vagrant-libvirt.box -# vagrant_box_url: https://download.fedoraproject.org/pub/fedora/linux/releases/22/Cloud/x86_64/Images/Fedora-Cloud-Base-Vagrant-22-20150521.x86_64.vagrant-virtualbox.box diff --git a/tests/functional/centos/7/docker-crypt-jrn-col/Vagrantfile b/tests/functional/centos/7/docker-crypt-jrn-col/Vagrantfile new file mode 120000 index 000000000..dfd7436c9 --- /dev/null +++ b/tests/functional/centos/7/docker-crypt-jrn-col/Vagrantfile @@ -0,0 +1 @@ +../../../../../Vagrantfile \ No newline at end of file diff --git a/tests/functional/centos/7/docker-crypt-jrn-col/group_vars/all b/tests/functional/centos/7/docker-crypt-jrn-col/group_vars/all new file mode 100644 index 000000000..2af26d451 --- /dev/null +++ b/tests/functional/centos/7/docker-crypt-jrn-col/group_vars/all @@ -0,0 +1,22 @@ +--- +# this is only here to let the CI tests know +# that this scenario is using docker +docker: True + +ceph_stable: True +containerized_deployment: True +cluster: ceph +monitor_interface: eth1 +ceph_mon_docker_subnet: "{{ public_network }}" +journal_size: 100 +ceph_docker_on_openstack: False +public_network: "192.168.15.0/24" +cluster_network: "192.168.16.0/24" +dmcrypt_journal_collocation: true +ceph_rgw_civetweb_port: 8080 +ceph_osd_docker_devices: "{{ devices }}" +devices: + - /dev/sda + - /dev/sdb +ceph_osd_docker_prepare_env: -e CLUSTER={{ cluster }} -e OSD_JOURNAL_SIZE={{ journal_size }} -e OSD_FORCE_ZAP=1 -e OSD_DMCRYPT=1 +ceph_osd_docker_extra_env: -e CLUSTER={{ cluster }} -e CEPH_DAEMON=OSD_CEPH_DISK_ACTIVATE -e OSD_JOURNAL_SIZE={{ journal_size }} -e OSD_DMCRYPT=1 diff --git a/tests/functional/centos/7/docker-crypt-jrn-col/hosts b/tests/functional/centos/7/docker-crypt-jrn-col/hosts new file mode 100644 index 000000000..f6a265ab3 --- /dev/null +++ b/tests/functional/centos/7/docker-crypt-jrn-col/hosts @@ -0,0 +1,5 @@ +[mons] +mon0 + +[osds] +osd0 diff --git a/tests/functional/centos/7/docker-crypt-jrn-col/vagrant_variables.yml b/tests/functional/centos/7/docker-crypt-jrn-col/vagrant_variables.yml new file mode 100644 index 000000000..aa03b197c --- /dev/null +++ b/tests/functional/centos/7/docker-crypt-jrn-col/vagrant_variables.yml @@ -0,0 +1,52 @@ +--- + +# 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 + +# SUBNETS TO USE FOR THE VMS +public_subnet: 192.168.15 +cluster_subnet: 192.168.16 + +# 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 +# +# NOTE(leseb): we use centos for this scenario since we at least need Docker version 1.12.5 +# which is not available in Atomic Host. +# There are bug like this one: https://github.com/docker/docker/issues/12694 +vagrant_box: centos/7 + +#ssh_private_key_path: "~/.ssh/id_rsa" +# The sync directory changes based on vagrant box +# Set to /home/vagrant/sync for Centos/7, /home/{ user }/vagrant for openstack and defaults to /vagrant +#vagrant_sync_dir: /home/vagrant/sync +#vagrant_sync_dir: / +# Disables synced folder creation. Not needed for testing, will skip mounting +# the vagrant directory on the remote box regardless of the provider. +vagrant_disable_synced_folder: true diff --git a/tests/functional/centos/7/docker-ded-jrn/Vagrantfile b/tests/functional/centos/7/docker-ded-jrn/Vagrantfile new file mode 120000 index 000000000..dfd7436c9 --- /dev/null +++ b/tests/functional/centos/7/docker-ded-jrn/Vagrantfile @@ -0,0 +1 @@ +../../../../../Vagrantfile \ No newline at end of file diff --git a/tests/functional/centos/7/docker-ded-jrn/group_vars/all b/tests/functional/centos/7/docker-ded-jrn/group_vars/all new file mode 100644 index 000000000..8bb92b26b --- /dev/null +++ b/tests/functional/centos/7/docker-ded-jrn/group_vars/all @@ -0,0 +1,22 @@ +--- +# this is only here to let the CI tests know +# that this scenario is using docker +docker: True + +ceph_stable: True +containerized_deployment: True +cluster: test +monitor_interface: eth1 +ceph_mon_docker_subnet: "{{ public_network }}" +journal_size: 100 +ceph_docker_on_openstack: False +public_network: "192.168.15.0/24" +cluster_network: "192.168.16.0/24" +ceph_rgw_civetweb_port: 8080 +ceph_osd_docker_devices: "{{ devices }}" +devices: + - /dev/sda +raw_journal_devices: + - /dev/sdb +ceph_osd_docker_prepare_env: -e CLUSTER={{ cluster }} -e OSD_JOURNAL_SIZE={{ journal_size }} -e OSD_FORCE_ZAP=1 -e OSD_JOURNAL={{ raw_journal_devices[0] }} +ceph_osd_docker_run_script_path: /var/tmp diff --git a/tests/functional/centos/7/docker-ded-jrn/hosts b/tests/functional/centos/7/docker-ded-jrn/hosts new file mode 100644 index 000000000..f6a265ab3 --- /dev/null +++ b/tests/functional/centos/7/docker-ded-jrn/hosts @@ -0,0 +1,5 @@ +[mons] +mon0 + +[osds] +osd0 diff --git a/tests/functional/centos/7/docker-ded-jrn/vagrant_variables.yml b/tests/functional/centos/7/docker-ded-jrn/vagrant_variables.yml new file mode 100644 index 000000000..aa03b197c --- /dev/null +++ b/tests/functional/centos/7/docker-ded-jrn/vagrant_variables.yml @@ -0,0 +1,52 @@ +--- + +# 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 + +# SUBNETS TO USE FOR THE VMS +public_subnet: 192.168.15 +cluster_subnet: 192.168.16 + +# 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 +# +# NOTE(leseb): we use centos for this scenario since we at least need Docker version 1.12.5 +# which is not available in Atomic Host. +# There are bug like this one: https://github.com/docker/docker/issues/12694 +vagrant_box: centos/7 + +#ssh_private_key_path: "~/.ssh/id_rsa" +# The sync directory changes based on vagrant box +# Set to /home/vagrant/sync for Centos/7, /home/{ user }/vagrant for openstack and defaults to /vagrant +#vagrant_sync_dir: /home/vagrant/sync +#vagrant_sync_dir: / +# Disables synced folder creation. Not needed for testing, will skip mounting +# the vagrant directory on the remote box regardless of the provider. +vagrant_disable_synced_folder: true diff --git a/tests/functional/centos/7/docker/Vagrantfile b/tests/functional/centos/7/docker/Vagrantfile new file mode 120000 index 000000000..dfd7436c9 --- /dev/null +++ b/tests/functional/centos/7/docker/Vagrantfile @@ -0,0 +1 @@ +../../../../../Vagrantfile \ 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 new file mode 100644 index 000000000..663b7dc24 --- /dev/null +++ b/tests/functional/centos/7/docker/group_vars/all @@ -0,0 +1,29 @@ +--- +# this is only here to let the CI tests know +# that this scenario is using docker +docker: True + +ceph_stable: True +containerized_deployment: True +cluster: test +monitor_interface: eth1 +ceph_mon_docker_subnet: "{{ public_network }}" +journal_size: 100 +ceph_docker_on_openstack: False +public_network: "192.168.15.0/24" +cluster_network: "192.168.16.0/24" +journal_collocation: true +ceph_rgw_civetweb_port: 8080 +ceph_osd_docker_devices: "{{ devices }}" +ceph_osd_docker_prepare_env: -e CLUSTER={{ cluster }} -e OSD_JOURNAL_SIZE={{ journal_size }} -e OSD_FORCE_ZAP=1 +ceph_osd_docker_extra_env: -e CLUSTER={{ cluster }} -e CEPH_DAEMON=OSD_CEPH_DISK_ACTIVATE +devices: + - /dev/sda + - /dev/sdb +ceph_osd_docker_run_script_path: /var/tmp +rgw_override_bucket_index_max_shards: 16 +rgw_bucket_default_quota_max_objects: 1638400 +ceph_conf_overrides: + global: + osd_pool_default_pg_num: 8 + osd_pool_default_size: 1 diff --git a/tests/functional/centos/7/docker/hosts b/tests/functional/centos/7/docker/hosts new file mode 100644 index 000000000..2d684367d --- /dev/null +++ b/tests/functional/centos/7/docker/hosts @@ -0,0 +1,16 @@ +[mons] +mon0 +mon1 +mon2 + +[osds] +osd0 + +[mdss] +mds0 + +[rgws] +rgw0 + +[mgrs] +mgr0 diff --git a/tests/functional/centos/7/docker/vagrant_variables.yml b/tests/functional/centos/7/docker/vagrant_variables.yml new file mode 100644 index 000000000..5c4d1081f --- /dev/null +++ b/tests/functional/centos/7/docker/vagrant_variables.yml @@ -0,0 +1,62 @@ +--- + +# DEPLOY CONTAINERIZED DAEMONS +docker: True + +# DEFINE THE NUMBER OF VMS TO RUN +mon_vms: 3 +osd_vms: 1 +mds_vms: 1 +rgw_vms: 1 +nfs_vms: 0 +rbd_mirror_vms: 1 +client_vms: 0 +iscsi_gw_vms: 0 +mgr_vms: 1 + +# Deploy RESTAPI on each of the Monitors +restapi: true + +# SUBNETS TO USE FOR THE VMS +public_subnet: 192.168.15 +cluster_subnet: 192.168.16 + +# 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 +#ssh_private_key_path: "~/.ssh/id_rsa" +# The sync directory changes based on vagrant box +# Set to /home/vagrant/sync for Centos/7, /home/{ user }/vagrant for openstack and defaults to /vagrant +#vagrant_sync_dir: /home/vagrant/sync +#vagrant_sync_dir: / +# Disables synced folder creation. Not needed for testing, will skip mounting +# the vagrant directory on the remote box regardless of the provider. +vagrant_disable_synced_folder: true +# VAGRANT URL +# This is a URL to download an image from an alternate location. vagrant_box +# above should be set to the filename of the image. +# Fedora virtualbox: https://download.fedoraproject.org/pub/fedora/linux/releases/22/Cloud/x86_64/Images/Fedora-Cloud-Base-Vagrant-22-20150521.x86_64.vagrant-virtualbox.box +# Fedora libvirt: https://download.fedoraproject.org/pub/fedora/linux/releases/22/Cloud/x86_64/Images/Fedora-Cloud-Base-Vagrant-22-20150521.x86_64.vagrant-libvirt.box +# vagrant_box_url: https://download.fedoraproject.org/pub/fedora/linux/releases/22/Cloud/x86_64/Images/Fedora-Cloud-Base-Vagrant-22-20150521.x86_64.vagrant-virtualbox.box diff --git a/tests/functional/centos/7/journal-collocation/Vagrantfile b/tests/functional/centos/7/journal-collocation/Vagrantfile deleted file mode 120000 index dfd7436c9..000000000 --- a/tests/functional/centos/7/journal-collocation/Vagrantfile +++ /dev/null @@ -1 +0,0 @@ -../../../../../Vagrantfile \ No newline at end of file diff --git a/tests/functional/centos/7/journal-collocation/group_vars/all b/tests/functional/centos/7/journal-collocation/group_vars/all deleted file mode 100644 index ac0c12116..000000000 --- a/tests/functional/centos/7/journal-collocation/group_vars/all +++ /dev/null @@ -1,16 +0,0 @@ ---- - -ceph_stable: True -cluster: test -public_network: "192.168.3.0/24" -cluster_network: "192.168.4.0/24" -monitor_interface: eth1 -journal_size: 100 -osd_objectstore: "filestore" -devices: - - '/dev/sda' - - '/dev/sdb' -journal_collocation: True -os_tuning_params: - - { name: kernel.pid_max, value: 4194303 } - - { name: fs.file-max, value: 26234859 } diff --git a/tests/functional/centos/7/journal-collocation/group_vars/osds b/tests/functional/centos/7/journal-collocation/group_vars/osds deleted file mode 100644 index ed9b23ad1..000000000 --- a/tests/functional/centos/7/journal-collocation/group_vars/osds +++ /dev/null @@ -1,4 +0,0 @@ ---- -os_tuning_params: - - { name: kernel.pid_max, value: 4194303 } - - { name: fs.file-max, value: 26234859 } diff --git a/tests/functional/centos/7/journal-collocation/hosts b/tests/functional/centos/7/journal-collocation/hosts deleted file mode 100644 index f6a265ab3..000000000 --- a/tests/functional/centos/7/journal-collocation/hosts +++ /dev/null @@ -1,5 +0,0 @@ -[mons] -mon0 - -[osds] -osd0 diff --git a/tests/functional/centos/7/journal-collocation/vagrant_variables.yml b/tests/functional/centos/7/journal-collocation/vagrant_variables.yml deleted file mode 100644 index cbb343842..000000000 --- a/tests/functional/centos/7/journal-collocation/vagrant_variables.yml +++ /dev/null @@ -1,74 +0,0 @@ ---- - -# DEPLOY CONTAINERIZED DAEMONS -docker: false - -# DEFINE THE NUMBER OF VMS TO RUN -mon_vms: 1 -osd_vms: 1 -mds_vms: 0 -rgw_vms: 0 -nfs_vms: 0 -rbd_mirror_vms: 0 -client_vms: 0 -iscsi_gw_vms: 0 -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.3 -cluster_subnet: 192.168.4 - -# MEMORY -# set 1024 for CentOS -memory: 512 - -# Ethernet interface name -# use eth1 for libvirt and ubuntu precise, enp0s8 for CentOS and ubuntu xenial -eth: 'eth1' - -# Disks -# For libvirt use disks: "[ '/dev/vdb', '/dev/vdc' ]" -# For CentOS7 use disks: "[ '/dev/sda', '/dev/sdb' ]" -disks: "[ '/dev/sdb', '/dev/sdc' ]" - -# VAGRANT BOX -# Ceph boxes are *strongly* suggested. They are under better control and will -# not get updated frequently unless required for build systems. These are (for -# now): -# -# * ceph/ubuntu-xenial -# -# Ubuntu: ceph/ubuntu-xenial bento/ubuntu-16.04 or ubuntu/trusty64 or ubuntu/wily64 -# CentOS: bento/centos-7.1 or puppetlabs/centos-7.0-64-puppet -# libvirt CentOS: centos/7 -# parallels Ubuntu: parallels/ubuntu-14.04 -# Debian: deb/jessie-amd64 - be careful the storage controller is named 'SATA Controller' -# For more boxes have a look at: -# - https://atlas.hashicorp.com/boxes/search?utf8=✓&sort=&provider=virtualbox&q= -# - https://download.gluster.org/pub/gluster/purpleidea/vagrant/ -vagrant_box: centos/7 -#ssh_private_key_path: "~/.ssh/id_rsa" -# The sync directory changes based on vagrant box -# Set to /home/vagrant/sync for Centos/7, /home/{ user }/vagrant for openstack and defaults to /vagrant -#vagrant_sync_dir: /home/vagrant/sync -#vagrant_sync_dir: / -# Disables synced folder creation. Not needed for testing, will skip mounting -# the vagrant directory on the remote box regardless of the provider. -vagrant_disable_synced_folder: true -# VAGRANT URL -# This is a URL to download an image from an alternate location. vagrant_box -# above should be set to the filename of the image. -# Fedora virtualbox: https://download.fedoraproject.org/pub/fedora/linux/releases/22/Cloud/x86_64/Images/Fedora-Cloud-Base-Vagrant-22-20150521.x86_64.vagrant-virtualbox.box -# Fedora libvirt: https://download.fedoraproject.org/pub/fedora/linux/releases/22/Cloud/x86_64/Images/Fedora-Cloud-Base-Vagrant-22-20150521.x86_64.vagrant-libvirt.box -# vagrant_box_url: https://download.fedoraproject.org/pub/fedora/linux/releases/22/Cloud/x86_64/Images/Fedora-Cloud-Base-Vagrant-22-20150521.x86_64.vagrant-virtualbox.box - -os_tuning_params: - - { name: kernel.pid_max, value: 4194303 } - - { name: fs.file-max, value: 26234859 } diff --git a/tests/functional/centos/7/jrn-col/Vagrantfile b/tests/functional/centos/7/jrn-col/Vagrantfile new file mode 120000 index 000000000..dfd7436c9 --- /dev/null +++ b/tests/functional/centos/7/jrn-col/Vagrantfile @@ -0,0 +1 @@ +../../../../../Vagrantfile \ No newline at end of file diff --git a/tests/functional/centos/7/jrn-col/group_vars/all b/tests/functional/centos/7/jrn-col/group_vars/all new file mode 100644 index 000000000..ac0c12116 --- /dev/null +++ b/tests/functional/centos/7/jrn-col/group_vars/all @@ -0,0 +1,16 @@ +--- + +ceph_stable: True +cluster: test +public_network: "192.168.3.0/24" +cluster_network: "192.168.4.0/24" +monitor_interface: eth1 +journal_size: 100 +osd_objectstore: "filestore" +devices: + - '/dev/sda' + - '/dev/sdb' +journal_collocation: True +os_tuning_params: + - { name: kernel.pid_max, value: 4194303 } + - { name: fs.file-max, value: 26234859 } diff --git a/tests/functional/centos/7/jrn-col/group_vars/osds b/tests/functional/centos/7/jrn-col/group_vars/osds new file mode 100644 index 000000000..ed9b23ad1 --- /dev/null +++ b/tests/functional/centos/7/jrn-col/group_vars/osds @@ -0,0 +1,4 @@ +--- +os_tuning_params: + - { name: kernel.pid_max, value: 4194303 } + - { name: fs.file-max, value: 26234859 } diff --git a/tests/functional/centos/7/jrn-col/hosts b/tests/functional/centos/7/jrn-col/hosts new file mode 100644 index 000000000..f6a265ab3 --- /dev/null +++ b/tests/functional/centos/7/jrn-col/hosts @@ -0,0 +1,5 @@ +[mons] +mon0 + +[osds] +osd0 diff --git a/tests/functional/centos/7/jrn-col/vagrant_variables.yml b/tests/functional/centos/7/jrn-col/vagrant_variables.yml new file mode 100644 index 000000000..cbb343842 --- /dev/null +++ b/tests/functional/centos/7/jrn-col/vagrant_variables.yml @@ -0,0 +1,74 @@ +--- + +# DEPLOY CONTAINERIZED DAEMONS +docker: false + +# DEFINE THE NUMBER OF VMS TO RUN +mon_vms: 1 +osd_vms: 1 +mds_vms: 0 +rgw_vms: 0 +nfs_vms: 0 +rbd_mirror_vms: 0 +client_vms: 0 +iscsi_gw_vms: 0 +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.3 +cluster_subnet: 192.168.4 + +# MEMORY +# set 1024 for CentOS +memory: 512 + +# Ethernet interface name +# use eth1 for libvirt and ubuntu precise, enp0s8 for CentOS and ubuntu xenial +eth: 'eth1' + +# Disks +# For libvirt use disks: "[ '/dev/vdb', '/dev/vdc' ]" +# For CentOS7 use disks: "[ '/dev/sda', '/dev/sdb' ]" +disks: "[ '/dev/sdb', '/dev/sdc' ]" + +# VAGRANT BOX +# Ceph boxes are *strongly* suggested. They are under better control and will +# not get updated frequently unless required for build systems. These are (for +# now): +# +# * ceph/ubuntu-xenial +# +# Ubuntu: ceph/ubuntu-xenial bento/ubuntu-16.04 or ubuntu/trusty64 or ubuntu/wily64 +# CentOS: bento/centos-7.1 or puppetlabs/centos-7.0-64-puppet +# libvirt CentOS: centos/7 +# parallels Ubuntu: parallels/ubuntu-14.04 +# Debian: deb/jessie-amd64 - be careful the storage controller is named 'SATA Controller' +# For more boxes have a look at: +# - https://atlas.hashicorp.com/boxes/search?utf8=✓&sort=&provider=virtualbox&q= +# - https://download.gluster.org/pub/gluster/purpleidea/vagrant/ +vagrant_box: centos/7 +#ssh_private_key_path: "~/.ssh/id_rsa" +# The sync directory changes based on vagrant box +# Set to /home/vagrant/sync for Centos/7, /home/{ user }/vagrant for openstack and defaults to /vagrant +#vagrant_sync_dir: /home/vagrant/sync +#vagrant_sync_dir: / +# Disables synced folder creation. Not needed for testing, will skip mounting +# the vagrant directory on the remote box regardless of the provider. +vagrant_disable_synced_folder: true +# VAGRANT URL +# This is a URL to download an image from an alternate location. vagrant_box +# above should be set to the filename of the image. +# Fedora virtualbox: https://download.fedoraproject.org/pub/fedora/linux/releases/22/Cloud/x86_64/Images/Fedora-Cloud-Base-Vagrant-22-20150521.x86_64.vagrant-virtualbox.box +# Fedora libvirt: https://download.fedoraproject.org/pub/fedora/linux/releases/22/Cloud/x86_64/Images/Fedora-Cloud-Base-Vagrant-22-20150521.x86_64.vagrant-libvirt.box +# vagrant_box_url: https://download.fedoraproject.org/pub/fedora/linux/releases/22/Cloud/x86_64/Images/Fedora-Cloud-Base-Vagrant-22-20150521.x86_64.vagrant-virtualbox.box + +os_tuning_params: + - { name: kernel.pid_max, value: 4194303 } + - { name: fs.file-max, value: 26234859 } diff --git a/tox.ini b/tox.ini index db6a35c9a..97cf03cbd 100644 --- a/tox.ini +++ b/tox.ini @@ -87,32 +87,32 @@ changedir= # tests a 1 mon, 1 osd, 1 mds and 1 rgw xenial cluster using raw_multi_journal OSD scenario xenial_cluster: {toxinidir}/tests/functional/ubuntu/16.04/cluster # tests a 1 mon 1 osd centos7 cluster using journal_collocation OSD scenario - journal_collocation: {toxinidir}/tests/functional/centos/7/journal-collocation + journal_collocation: {toxinidir}/tests/functional/centos/7/jrn-col # tests a 1 mon 1 osd centos7 cluster using dmcrypt_dedicated_journal OSD scenario - dmcrypt_journal: {toxinidir}/tests/functional/centos/7/dmcrypt-dedicated-journal + dmcrypt_journal: {toxinidir}/tests/functional/centos/7/crypt-ded-jrn # tests a 1 mon 1 osd centos7 cluster using dmcrypt_journal_collocation OSD scenario - dmcrypt_journal_collocation: {toxinidir}/tests/functional/centos/7/dmcrypt-journal-collocation + dmcrypt_journal_collocation: {toxinidir}/tests/functional/centos/7/crypt-jrn-col # tests a 1 mon, 1 osd, 1 mds and 1 rgw centos7 cluster using raw_multi_journal OSD scenario centos7_cluster: {toxinidir}/tests/functional/centos/7/cluster # an alias for centos7_cluster, this makes the name better suited for rhcs testing cluster: {toxinidir}/tests/functional/centos/7/cluster # tests a 1 mon, 1 osd, 1 mds and 1 rgw centos7 cluster using docker - docker_cluster: {toxinidir}/tests/functional/centos/7/docker-cluster - update_docker_cluster: {toxinidir}/tests/functional/centos/7/docker-cluster - purge_docker_cluster: {toxinidir}/tests/functional/centos/7/docker-cluster - docker_dedicated_journal: {toxinidir}/tests/functional/centos/7/docker-cluster-dedicated-journal - docker_dmcrypt_journal_collocation: {toxinidir}/tests/functional/centos/7/docker-cluster-dmcrypt-journal-collocation + docker_cluster: {toxinidir}/tests/functional/centos/7/docker + update_docker_cluster: {toxinidir}/tests/functional/centos/7/docker + purge_docker_cluster: {toxinidir}/tests/functional/centos/7/docker + docker_dedicated_journal: {toxinidir}/tests/functional/centos/7/docker-ded-jrn + docker_dmcrypt_journal_collocation: {toxinidir}/tests/functional/centos/7/docker-crypt-jrn-col purge_cluster: {toxinidir}/tests/functional/ubuntu/16.04/cluster - purge_dmcrypt: {toxinidir}/tests/functional/centos/7/dmcrypt-dedicated-journal - update_dmcrypt: {toxinidir}/tests/functional/centos/7/dmcrypt-dedicated-journal + purge_dmcrypt: {toxinidir}/tests/functional/centos/7/crypt-ded-jrn + update_dmcrypt: {toxinidir}/tests/functional/centos/7/crypt-ded-jrn update_cluster: {toxinidir}/tests/functional/centos/7/cluster - bluestore_journal_collocation: {toxinidir}/tests/functional/centos/7/bs-journal-collocation - bluestore_cluster: {toxinidir}/tests/functional/centos/7/bs-cluster - bluestore_dmcrypt_journal: {toxinidir}/tests/functional/centos/7/bs-dmcrypt-dedicated-journal - bluestore_dmcrypt_journal_collocation: {toxinidir}/tests/functional/centos/7/bs-dmcrypt-journal-colloc - bluestore_docker_cluster: {toxinidir}/tests/functional/centos/7/bs-docker-cluster - bluestore_docker_dedicated_journal: {toxinidir}/tests/functional/centos/7/bs-docker-cluster-dedicated-journal - bluestore_docker_dmcrypt_journal_collocation: {toxinidir}/tests/functional/centos/7/bs-docker-dmcrypt-journal-colloc + bluestore_journal_collocation: {toxinidir}/tests/functional/centos/7/bs-jrn-col + bluestore_cluster: {toxinidir}/tests/functional/centos/7/bluestore + bluestore_dmcrypt_journal: {toxinidir}/tests/functional/centos/7/bs-crypt-ded-jrn + bluestore_dmcrypt_journal_collocation: {toxinidir}/tests/functional/centos/7/bs-crypt-jrn-col + bluestore_docker_cluster: {toxinidir}/tests/functional/centos/7/bs-docker + bluestore_docker_dedicated_journal: {toxinidir}/tests/functional/centos/7/bs-dock-ded-jrn + bluestore_docker_dmcrypt_journal_collocation: {toxinidir}/tests/functional/centos/7/bs-dock-crypt-jrn-col commands= rhcs: ansible-playbook -vv -i "localhost," -c local {toxinidir}/tests/functional/rhcs_setup.yml --extra-vars "change_dir={changedir}" --tags "vagrant_setup"