From 1c8680ef2d0468348a2cda5b3ac03157ab837216 Mon Sep 17 00:00:00 2001 From: Guillaume Abrioux Date: Tue, 4 Jul 2017 17:12:32 +0200 Subject: [PATCH] Tests: Add bluestore tests MIME-Version: 1.0 Content-Type: text/plain; charset=utf8 Content-Transfer-Encoding: 8bit Add two scenarios bluestore_journal_collocation and bluestore_cluster. Signed-off-by: Sébastien Han --- .../centos/7/bs-cluster/Vagrantfile | 1 + .../centos/7/bs-cluster/group_vars/all | 23 ++++++ .../centos/7/bs-cluster/group_vars/osds | 4 + .../centos/7/bs-cluster/group_vars/rgws | 8 ++ tests/functional/centos/7/bs-cluster/hosts | 19 +++++ .../centos/7/bs-cluster/vagrant_variables.yml | 74 +++++++++++++++++++ .../7/bs-journal-collocation/Vagrantfile | 1 + .../7/bs-journal-collocation/group_vars/all | 16 ++++ .../7/bs-journal-collocation/group_vars/osds | 4 + .../centos/7/bs-journal-collocation/hosts | 5 ++ .../vagrant_variables.yml | 74 +++++++++++++++++++ tox.ini | 5 +- 12 files changed, 233 insertions(+), 1 deletion(-) create mode 120000 tests/functional/centos/7/bs-cluster/Vagrantfile create mode 100644 tests/functional/centos/7/bs-cluster/group_vars/all create mode 100644 tests/functional/centos/7/bs-cluster/group_vars/osds create mode 100644 tests/functional/centos/7/bs-cluster/group_vars/rgws create mode 100644 tests/functional/centos/7/bs-cluster/hosts create mode 100644 tests/functional/centos/7/bs-cluster/vagrant_variables.yml create mode 120000 tests/functional/centos/7/bs-journal-collocation/Vagrantfile create mode 100644 tests/functional/centos/7/bs-journal-collocation/group_vars/all create mode 100644 tests/functional/centos/7/bs-journal-collocation/group_vars/osds create mode 100644 tests/functional/centos/7/bs-journal-collocation/hosts create mode 100644 tests/functional/centos/7/bs-journal-collocation/vagrant_variables.yml diff --git a/tests/functional/centos/7/bs-cluster/Vagrantfile b/tests/functional/centos/7/bs-cluster/Vagrantfile new file mode 120000 index 000000000..dfd7436c9 --- /dev/null +++ b/tests/functional/centos/7/bs-cluster/Vagrantfile @@ -0,0 +1 @@ +../../../../../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 new file mode 100644 index 000000000..b2ad849cb --- /dev/null +++ b/tests/functional/centos/7/bs-cluster/group_vars/all @@ -0,0 +1,23 @@ +--- + +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 diff --git a/tests/functional/centos/7/bs-cluster/group_vars/osds b/tests/functional/centos/7/bs-cluster/group_vars/osds new file mode 100644 index 000000000..ed9b23ad1 --- /dev/null +++ b/tests/functional/centos/7/bs-cluster/group_vars/osds @@ -0,0 +1,4 @@ +--- +os_tuning_params: + - { name: kernel.pid_max, value: 4194303 } + - { name: fs.file-max, value: 26234859 } diff --git a/tests/functional/centos/7/bs-cluster/group_vars/rgws b/tests/functional/centos/7/bs-cluster/group_vars/rgws new file mode 100644 index 000000000..6aab772a0 --- /dev/null +++ b/tests/functional/centos/7/bs-cluster/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/bs-cluster/hosts b/tests/functional/centos/7/bs-cluster/hosts new file mode 100644 index 000000000..008f2cb56 --- /dev/null +++ b/tests/functional/centos/7/bs-cluster/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/bs-cluster/vagrant_variables.yml b/tests/functional/centos/7/bs-cluster/vagrant_variables.yml new file mode 100644 index 000000000..576ef0034 --- /dev/null +++ b/tests/functional/centos/7/bs-cluster/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-journal-collocation/Vagrantfile b/tests/functional/centos/7/bs-journal-collocation/Vagrantfile new file mode 120000 index 000000000..dfd7436c9 --- /dev/null +++ b/tests/functional/centos/7/bs-journal-collocation/Vagrantfile @@ -0,0 +1 @@ +../../../../../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 new file mode 100644 index 000000000..256f69206 --- /dev/null +++ b/tests/functional/centos/7/bs-journal-collocation/group_vars/all @@ -0,0 +1,16 @@ +--- + +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 } diff --git a/tests/functional/centos/7/bs-journal-collocation/group_vars/osds b/tests/functional/centos/7/bs-journal-collocation/group_vars/osds new file mode 100644 index 000000000..ed9b23ad1 --- /dev/null +++ b/tests/functional/centos/7/bs-journal-collocation/group_vars/osds @@ -0,0 +1,4 @@ +--- +os_tuning_params: + - { name: kernel.pid_max, value: 4194303 } + - { name: fs.file-max, value: 26234859 } diff --git a/tests/functional/centos/7/bs-journal-collocation/hosts b/tests/functional/centos/7/bs-journal-collocation/hosts new file mode 100644 index 000000000..89721c03e --- /dev/null +++ b/tests/functional/centos/7/bs-journal-collocation/hosts @@ -0,0 +1,5 @@ +[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 new file mode 100644 index 000000000..cbb343842 --- /dev/null +++ b/tests/functional/centos/7/bs-journal-collocation/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 f3942b876..6a011db16 100644 --- a/tox.ini +++ b/tox.ini @@ -1,5 +1,5 @@ [tox] -envlist = {jewel,kraken,rhcs}-{ansible2.2}-{xenial_cluster,journal_collocation,centos7_cluster,dmcrypt_journal,dmcrypt_journal_collocation,docker_cluster,purge_cluster,purge_dmcrypt,docker_dedicated_journal,docker_dmcrypt_journal_collocation,update_dmcrypt,update_cluster,cluster,purge_docker_cluster,update_docker_cluster} +envlist = {jewel,kraken,rhcs}-{ansible2.2}-{xenial_cluster,journal_collocation,centos7_cluster,dmcrypt_journal,dmcrypt_journal_collocation,docker_cluster,purge_cluster,purge_dmcrypt,docker_dedicated_journal,docker_dmcrypt_journal_collocation,update_dmcrypt,update_cluster,cluster,purge_docker_cluster,update_docker_cluster,bluestore_journal_collocation,bluestore_cluster} skipsdist = True # extra commands for purging clusters @@ -97,6 +97,9 @@ changedir= purge_dmcrypt: {toxinidir}/tests/functional/centos/7/dmcrypt-dedicated-journal update_dmcrypt: {toxinidir}/tests/functional/centos/7/dmcrypt-dedicated-journal 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 + commands= rhcs: ansible-playbook -vv -i "localhost," -c local {toxinidir}/tests/functional/rhcs_setup.yml --extra-vars "change_dir={changedir}" --tags "vagrant_setup" -- 2.39.5