From 90c66a5848284fdc90e6e0993abb678f30440a49 Mon Sep 17 00:00:00 2001 From: =?utf8?q?S=C3=A9bastien=20Han?= Date: Thu, 12 Jul 2018 20:30:59 +0200 Subject: [PATCH] ci: test lvm in containerized MIME-Version: 1.0 Content-Type: text/plain; charset=utf8 Content-Transfer-Encoding: 8bit Signed-off-by: Sébastien Han --- .../7/bs-lvm-osds-container/Vagrantfile | 1 + .../bs-lvm-osds-container/ceph-override.json | 1 + .../7/bs-lvm-osds-container/group_vars/all | 25 +++++++ .../centos/7/bs-lvm-osds-container/hosts | 8 ++ .../vagrant_variables.yml | 73 +++++++++++++++++++ .../centos/7/lvm-batch-container/Vagrantfile | 1 + .../7/lvm-batch-container/ceph-override.json | 9 +++ .../7/lvm-batch-container/group_vars/all | 23 ++++++ .../centos/7/lvm-batch-container/hosts | 8 ++ .../lvm-batch-container/vagrant_variables.yml | 73 +++++++++++++++++++ .../centos/7/lvm-osds-container/Vagrantfile | 1 + .../7/lvm-osds-container/ceph-override.json | 1 + .../7/lvm-osds-container/group_vars/all | 28 +++++++ .../centos/7/lvm-osds-container/hosts | 8 ++ .../lvm-osds-container/vagrant_variables.yml | 73 +++++++++++++++++++ tox.ini | 10 ++- 16 files changed, 342 insertions(+), 1 deletion(-) create mode 120000 tests/functional/centos/7/bs-lvm-osds-container/Vagrantfile create mode 120000 tests/functional/centos/7/bs-lvm-osds-container/ceph-override.json create mode 100644 tests/functional/centos/7/bs-lvm-osds-container/group_vars/all create mode 100644 tests/functional/centos/7/bs-lvm-osds-container/hosts create mode 100644 tests/functional/centos/7/bs-lvm-osds-container/vagrant_variables.yml create mode 120000 tests/functional/centos/7/lvm-batch-container/Vagrantfile create mode 100644 tests/functional/centos/7/lvm-batch-container/ceph-override.json create mode 100644 tests/functional/centos/7/lvm-batch-container/group_vars/all create mode 100644 tests/functional/centos/7/lvm-batch-container/hosts create mode 100644 tests/functional/centos/7/lvm-batch-container/vagrant_variables.yml create mode 120000 tests/functional/centos/7/lvm-osds-container/Vagrantfile create mode 120000 tests/functional/centos/7/lvm-osds-container/ceph-override.json create mode 100644 tests/functional/centos/7/lvm-osds-container/group_vars/all create mode 100644 tests/functional/centos/7/lvm-osds-container/hosts create mode 100644 tests/functional/centos/7/lvm-osds-container/vagrant_variables.yml diff --git a/tests/functional/centos/7/bs-lvm-osds-container/Vagrantfile b/tests/functional/centos/7/bs-lvm-osds-container/Vagrantfile new file mode 120000 index 000000000..dfd7436c9 --- /dev/null +++ b/tests/functional/centos/7/bs-lvm-osds-container/Vagrantfile @@ -0,0 +1 @@ +../../../../../Vagrantfile \ No newline at end of file diff --git a/tests/functional/centos/7/bs-lvm-osds-container/ceph-override.json b/tests/functional/centos/7/bs-lvm-osds-container/ceph-override.json new file mode 120000 index 000000000..775cb006a --- /dev/null +++ b/tests/functional/centos/7/bs-lvm-osds-container/ceph-override.json @@ -0,0 +1 @@ +../cluster/ceph-override.json \ No newline at end of file diff --git a/tests/functional/centos/7/bs-lvm-osds-container/group_vars/all b/tests/functional/centos/7/bs-lvm-osds-container/group_vars/all new file mode 100644 index 000000000..1de1598e6 --- /dev/null +++ b/tests/functional/centos/7/bs-lvm-osds-container/group_vars/all @@ -0,0 +1,25 @@ +--- + +ceph_origin: repository +ceph_repository: community +containerized_deployment: True +cluster: test +public_network: "192.168.39.0/24" +cluster_network: "192.168.40.0/24" +monitor_interface: eth1 +osd_objectstore: "bluestore" +osd_scenario: lvm +copy_admin_key: true +# test-volume is created by tests/functional/lvm_setup.yml from /dev/sdb +lvm_volumes: + - data: data-lv1 + data_vg: test_group + - data: data-lv2 + data_vg: test_group + db: journal1 + db_vg: journals +os_tuning_params: + - { name: fs.file-max, value: 26234859 } +ceph_conf_overrides: + global: + osd_pool_default_size: 1 diff --git a/tests/functional/centos/7/bs-lvm-osds-container/hosts b/tests/functional/centos/7/bs-lvm-osds-container/hosts new file mode 100644 index 000000000..d6c89012a --- /dev/null +++ b/tests/functional/centos/7/bs-lvm-osds-container/hosts @@ -0,0 +1,8 @@ +[mons] +mon0 + +[mgrs] +mon0 + +[osds] +osd0 diff --git a/tests/functional/centos/7/bs-lvm-osds-container/vagrant_variables.yml b/tests/functional/centos/7/bs-lvm-osds-container/vagrant_variables.yml new file mode 100644 index 000000000..bd8309495 --- /dev/null +++ b/tests/functional/centos/7/bs-lvm-osds-container/vagrant_variables.yml @@ -0,0 +1,73 @@ +--- + +# DEPLOY CONTAINERIZED DAEMONS +docker: true + +# DEFINE THE NUMBER OF VMS TO RUN +mon_vms: 1 +osd_vms: 1 +mds_vms: 0 +rgw_vms: 0 +nfs_vms: 0 +rbd_mirror_vms: 0 +client_vms: 0 +iscsi_gw_vms: 0 +mgr_vms: 0 + +# Deploy RESTAPI on each of the Monitors +restapi: true + +# INSTALL SOURCE OF CEPH +# valid values are 'stable' and 'dev' +ceph_install_source: stable + +# SUBNETS TO USE FOR THE VMS +public_subnet: 192.168.39 +cluster_subnet: 192.168.40 + +# MEMORY +# set 1024 for CentOS +memory: 512 + +# Ethernet interface name +# use eth1 for libvirt and ubuntu precise, enp0s8 for CentOS and ubuntu xenial +eth: 'eth1' + +# Disks +# For libvirt use disks: "[ '/dev/vdb', '/dev/vdc' ]" +# For CentOS7 use disks: "[ '/dev/sda', '/dev/sdb' ]" +disks: "[ '/dev/sdb', '/dev/sdc' ]" + +# VAGRANT BOX +# Ceph boxes are *strongly* suggested. They are under better control and will +# not get updated frequently unless required for build systems. These are (for +# now): +# +# * ceph/ubuntu-xenial +# +# Ubuntu: ceph/ubuntu-xenial bento/ubuntu-16.04 or ubuntu/trusty64 or ubuntu/wily64 +# CentOS: bento/centos-7.1 or puppetlabs/centos-7.0-64-puppet +# libvirt CentOS: centos/7 +# parallels Ubuntu: parallels/ubuntu-14.04 +# Debian: deb/jessie-amd64 - be careful the storage controller is named 'SATA Controller' +# For more boxes have a look at: +# - https://atlas.hashicorp.com/boxes/search?utf8=✓&sort=&provider=virtualbox&q= +# - https://download.gluster.org/pub/gluster/purpleidea/vagrant/ +vagrant_box: centos/atomic-host +#ssh_private_key_path: "~/.ssh/id_rsa" +# The sync directory changes based on vagrant box +# Set to /home/vagrant/sync for Centos/7, /home/{ user }/vagrant for openstack and defaults to /vagrant +#vagrant_sync_dir: /home/vagrant/sync +vagrant_sync_dir: /vagrant +# Disables synced folder creation. Not needed for testing, will skip mounting +# the vagrant directory on the remote box regardless of the provider. +vagrant_disable_synced_folder: true +# VAGRANT URL +# This is a URL to download an image from an alternate location. vagrant_box +# above should be set to the filename of the image. +# Fedora virtualbox: https://download.fedoraproject.org/pub/fedora/linux/releases/22/Cloud/x86_64/Images/Fedora-Cloud-Base-Vagrant-22-20150521.x86_64.vagrant-virtualbox.box +# Fedora libvirt: https://download.fedoraproject.org/pub/fedora/linux/releases/22/Cloud/x86_64/Images/Fedora-Cloud-Base-Vagrant-22-20150521.x86_64.vagrant-libvirt.box +# vagrant_box_url: https://download.fedoraproject.org/pub/fedora/linux/releases/22/Cloud/x86_64/Images/Fedora-Cloud-Base-Vagrant-22-20150521.x86_64.vagrant-virtualbox.box + +os_tuning_params: + - { name: fs.file-max, value: 26234859 } diff --git a/tests/functional/centos/7/lvm-batch-container/Vagrantfile b/tests/functional/centos/7/lvm-batch-container/Vagrantfile new file mode 120000 index 000000000..dfd7436c9 --- /dev/null +++ b/tests/functional/centos/7/lvm-batch-container/Vagrantfile @@ -0,0 +1 @@ +../../../../../Vagrantfile \ No newline at end of file diff --git a/tests/functional/centos/7/lvm-batch-container/ceph-override.json b/tests/functional/centos/7/lvm-batch-container/ceph-override.json new file mode 100644 index 000000000..1a9600a14 --- /dev/null +++ b/tests/functional/centos/7/lvm-batch-container/ceph-override.json @@ -0,0 +1,9 @@ +{ + "ceph_conf_overrides": { + "global": { + "osd_pool_default_pg_num": 12, + "osd_pool_default_size": 1 + } + }, + "ceph_mon_docker_memory_limit": "2g" +} diff --git a/tests/functional/centos/7/lvm-batch-container/group_vars/all b/tests/functional/centos/7/lvm-batch-container/group_vars/all new file mode 100644 index 000000000..0555ffa38 --- /dev/null +++ b/tests/functional/centos/7/lvm-batch-container/group_vars/all @@ -0,0 +1,23 @@ +--- + +containerized_deployment: True +ceph_origin: repository +ceph_repository: community +cluster: ceph +public_network: "192.168.39.0/24" +cluster_network: "192.168.40.0/24" +monitor_interface: eth1 +radosgw_interface: eth1 +journal_size: 100 +osd_objectstore: "bluestore" +crush_device_class: test +osd_scenario: lvm +copy_admin_key: true +devices: + - /dev/sdb + - /dev/sdc +os_tuning_params: + - { name: fs.file-max, value: 26234859 } +ceph_conf_overrides: + global: + osd_pool_default_size: 1 diff --git a/tests/functional/centos/7/lvm-batch-container/hosts b/tests/functional/centos/7/lvm-batch-container/hosts new file mode 100644 index 000000000..d6c89012a --- /dev/null +++ b/tests/functional/centos/7/lvm-batch-container/hosts @@ -0,0 +1,8 @@ +[mons] +mon0 + +[mgrs] +mon0 + +[osds] +osd0 diff --git a/tests/functional/centos/7/lvm-batch-container/vagrant_variables.yml b/tests/functional/centos/7/lvm-batch-container/vagrant_variables.yml new file mode 100644 index 000000000..bd8309495 --- /dev/null +++ b/tests/functional/centos/7/lvm-batch-container/vagrant_variables.yml @@ -0,0 +1,73 @@ +--- + +# DEPLOY CONTAINERIZED DAEMONS +docker: true + +# DEFINE THE NUMBER OF VMS TO RUN +mon_vms: 1 +osd_vms: 1 +mds_vms: 0 +rgw_vms: 0 +nfs_vms: 0 +rbd_mirror_vms: 0 +client_vms: 0 +iscsi_gw_vms: 0 +mgr_vms: 0 + +# Deploy RESTAPI on each of the Monitors +restapi: true + +# INSTALL SOURCE OF CEPH +# valid values are 'stable' and 'dev' +ceph_install_source: stable + +# SUBNETS TO USE FOR THE VMS +public_subnet: 192.168.39 +cluster_subnet: 192.168.40 + +# MEMORY +# set 1024 for CentOS +memory: 512 + +# Ethernet interface name +# use eth1 for libvirt and ubuntu precise, enp0s8 for CentOS and ubuntu xenial +eth: 'eth1' + +# Disks +# For libvirt use disks: "[ '/dev/vdb', '/dev/vdc' ]" +# For CentOS7 use disks: "[ '/dev/sda', '/dev/sdb' ]" +disks: "[ '/dev/sdb', '/dev/sdc' ]" + +# VAGRANT BOX +# Ceph boxes are *strongly* suggested. They are under better control and will +# not get updated frequently unless required for build systems. These are (for +# now): +# +# * ceph/ubuntu-xenial +# +# Ubuntu: ceph/ubuntu-xenial bento/ubuntu-16.04 or ubuntu/trusty64 or ubuntu/wily64 +# CentOS: bento/centos-7.1 or puppetlabs/centos-7.0-64-puppet +# libvirt CentOS: centos/7 +# parallels Ubuntu: parallels/ubuntu-14.04 +# Debian: deb/jessie-amd64 - be careful the storage controller is named 'SATA Controller' +# For more boxes have a look at: +# - https://atlas.hashicorp.com/boxes/search?utf8=✓&sort=&provider=virtualbox&q= +# - https://download.gluster.org/pub/gluster/purpleidea/vagrant/ +vagrant_box: centos/atomic-host +#ssh_private_key_path: "~/.ssh/id_rsa" +# The sync directory changes based on vagrant box +# Set to /home/vagrant/sync for Centos/7, /home/{ user }/vagrant for openstack and defaults to /vagrant +#vagrant_sync_dir: /home/vagrant/sync +vagrant_sync_dir: /vagrant +# Disables synced folder creation. Not needed for testing, will skip mounting +# the vagrant directory on the remote box regardless of the provider. +vagrant_disable_synced_folder: true +# VAGRANT URL +# This is a URL to download an image from an alternate location. vagrant_box +# above should be set to the filename of the image. +# Fedora virtualbox: https://download.fedoraproject.org/pub/fedora/linux/releases/22/Cloud/x86_64/Images/Fedora-Cloud-Base-Vagrant-22-20150521.x86_64.vagrant-virtualbox.box +# Fedora libvirt: https://download.fedoraproject.org/pub/fedora/linux/releases/22/Cloud/x86_64/Images/Fedora-Cloud-Base-Vagrant-22-20150521.x86_64.vagrant-libvirt.box +# vagrant_box_url: https://download.fedoraproject.org/pub/fedora/linux/releases/22/Cloud/x86_64/Images/Fedora-Cloud-Base-Vagrant-22-20150521.x86_64.vagrant-virtualbox.box + +os_tuning_params: + - { name: fs.file-max, value: 26234859 } diff --git a/tests/functional/centos/7/lvm-osds-container/Vagrantfile b/tests/functional/centos/7/lvm-osds-container/Vagrantfile new file mode 120000 index 000000000..dfd7436c9 --- /dev/null +++ b/tests/functional/centos/7/lvm-osds-container/Vagrantfile @@ -0,0 +1 @@ +../../../../../Vagrantfile \ No newline at end of file diff --git a/tests/functional/centos/7/lvm-osds-container/ceph-override.json b/tests/functional/centos/7/lvm-osds-container/ceph-override.json new file mode 120000 index 000000000..775cb006a --- /dev/null +++ b/tests/functional/centos/7/lvm-osds-container/ceph-override.json @@ -0,0 +1 @@ +../cluster/ceph-override.json \ No newline at end of file diff --git a/tests/functional/centos/7/lvm-osds-container/group_vars/all b/tests/functional/centos/7/lvm-osds-container/group_vars/all new file mode 100644 index 000000000..0a29dff68 --- /dev/null +++ b/tests/functional/centos/7/lvm-osds-container/group_vars/all @@ -0,0 +1,28 @@ +--- + +ceph_origin: repository +ceph_repository: community +cluster: ceph +public_network: "192.168.39.0/24" +cluster_network: "192.168.40.0/24" +monitor_interface: eth1 +radosgw_interface: eth1 +journal_size: 100 +osd_objectstore: "filestore" +osd_scenario: lvm +copy_admin_key: true +containerized_deployment: true +# test-volume is created by tests/functional/lvm_setup.yml from /dev/sdb +lvm_volumes: + - data: data-lv1 + journal: /dev/sdc1 + data_vg: test_group + - data: data-lv2 + journal: journal1 + data_vg: test_group + journal_vg: journals +os_tuning_params: + - { name: fs.file-max, value: 26234859 } +ceph_conf_overrides: + global: + osd_pool_default_size: 1 diff --git a/tests/functional/centos/7/lvm-osds-container/hosts b/tests/functional/centos/7/lvm-osds-container/hosts new file mode 100644 index 000000000..d6c89012a --- /dev/null +++ b/tests/functional/centos/7/lvm-osds-container/hosts @@ -0,0 +1,8 @@ +[mons] +mon0 + +[mgrs] +mon0 + +[osds] +osd0 diff --git a/tests/functional/centos/7/lvm-osds-container/vagrant_variables.yml b/tests/functional/centos/7/lvm-osds-container/vagrant_variables.yml new file mode 100644 index 000000000..bd8309495 --- /dev/null +++ b/tests/functional/centos/7/lvm-osds-container/vagrant_variables.yml @@ -0,0 +1,73 @@ +--- + +# DEPLOY CONTAINERIZED DAEMONS +docker: true + +# DEFINE THE NUMBER OF VMS TO RUN +mon_vms: 1 +osd_vms: 1 +mds_vms: 0 +rgw_vms: 0 +nfs_vms: 0 +rbd_mirror_vms: 0 +client_vms: 0 +iscsi_gw_vms: 0 +mgr_vms: 0 + +# Deploy RESTAPI on each of the Monitors +restapi: true + +# INSTALL SOURCE OF CEPH +# valid values are 'stable' and 'dev' +ceph_install_source: stable + +# SUBNETS TO USE FOR THE VMS +public_subnet: 192.168.39 +cluster_subnet: 192.168.40 + +# MEMORY +# set 1024 for CentOS +memory: 512 + +# Ethernet interface name +# use eth1 for libvirt and ubuntu precise, enp0s8 for CentOS and ubuntu xenial +eth: 'eth1' + +# Disks +# For libvirt use disks: "[ '/dev/vdb', '/dev/vdc' ]" +# For CentOS7 use disks: "[ '/dev/sda', '/dev/sdb' ]" +disks: "[ '/dev/sdb', '/dev/sdc' ]" + +# VAGRANT BOX +# Ceph boxes are *strongly* suggested. They are under better control and will +# not get updated frequently unless required for build systems. These are (for +# now): +# +# * ceph/ubuntu-xenial +# +# Ubuntu: ceph/ubuntu-xenial bento/ubuntu-16.04 or ubuntu/trusty64 or ubuntu/wily64 +# CentOS: bento/centos-7.1 or puppetlabs/centos-7.0-64-puppet +# libvirt CentOS: centos/7 +# parallels Ubuntu: parallels/ubuntu-14.04 +# Debian: deb/jessie-amd64 - be careful the storage controller is named 'SATA Controller' +# For more boxes have a look at: +# - https://atlas.hashicorp.com/boxes/search?utf8=✓&sort=&provider=virtualbox&q= +# - https://download.gluster.org/pub/gluster/purpleidea/vagrant/ +vagrant_box: centos/atomic-host +#ssh_private_key_path: "~/.ssh/id_rsa" +# The sync directory changes based on vagrant box +# Set to /home/vagrant/sync for Centos/7, /home/{ user }/vagrant for openstack and defaults to /vagrant +#vagrant_sync_dir: /home/vagrant/sync +vagrant_sync_dir: /vagrant +# Disables synced folder creation. Not needed for testing, will skip mounting +# the vagrant directory on the remote box regardless of the provider. +vagrant_disable_synced_folder: true +# VAGRANT URL +# This is a URL to download an image from an alternate location. vagrant_box +# above should be set to the filename of the image. +# Fedora virtualbox: https://download.fedoraproject.org/pub/fedora/linux/releases/22/Cloud/x86_64/Images/Fedora-Cloud-Base-Vagrant-22-20150521.x86_64.vagrant-virtualbox.box +# Fedora libvirt: https://download.fedoraproject.org/pub/fedora/linux/releases/22/Cloud/x86_64/Images/Fedora-Cloud-Base-Vagrant-22-20150521.x86_64.vagrant-libvirt.box +# vagrant_box_url: https://download.fedoraproject.org/pub/fedora/linux/releases/22/Cloud/x86_64/Images/Fedora-Cloud-Base-Vagrant-22-20150521.x86_64.vagrant-virtualbox.box + +os_tuning_params: + - { name: fs.file-max, value: 26234859 } diff --git a/tox.ini b/tox.ini index a041bc5a7..ae1baf68b 100644 --- a/tox.ini +++ b/tox.ini @@ -1,6 +1,6 @@ [tox] envlist = {dev,jewel,luminous,mimic,rhcs}-{xenial_cluster,centos7_cluster,docker_cluster,update_cluster,cluster,update_docker_cluster,switch_to_containers,purge_filestore_osds_container,purge_filestore_osds_non_container,purge_cluster_non_container,purge_cluster_container,ooo_collocation} - {dev,luminous,mimic,rhcs}-{filestore_osds_non_container,filestore_osds_container,bluestore_osds_container,bluestore_osds_non_container,bluestore_lvm_osds,lvm_osds,purge_lvm_osds,shrink_mon,shrink_osd,shrink_mon_container,shrink_osd_container,docker_cluster_collocation,purge_bluestore_osds_non_container,purge_bluestore_osds_container,lvm_batch} + {dev,luminous,mimic,rhcs}-{filestore_osds_non_container,filestore_osds_container,bluestore_osds_container,bluestore_osds_non_container,bluestore_lvm_osds,bluestore_lvm_osds_container,lvm_osds,purge_lvm_osds,shrink_mon,shrink_osd,shrink_mon_container,shrink_osd_container,docker_cluster_collocation,purge_bluestore_osds_non_container,purge_bluestore_osds_container,lvm_batch,lvm_osds_container,lvm_batch_container} infra_lv_create skipsdist = True @@ -199,7 +199,11 @@ setenv= mimic: UPDATE_CEPH_STABLE_RELEASE = mimic mimic: UPDATE_CEPH_DOCKER_IMAGE_TAG = latest lvm_osds: CEPH_STABLE_RELEASE = luminous + lvm_osds: PLAYBOOK = site.yml.sample + lvm_osds_container: CEPH_STABLE_RELEASE = luminous + lvm_osds_container: PLAYBOOK = site-docker.yml.sample bluestore_lvm_osds: CEPH_STABLE_RELEASE = luminous + bluestore_lvm_osds_container: CEPH_STABLE_RELEASE = luminous update_cluster: ROLLING_UPDATE = True update_docker_cluster: ROLLING_UPDATE = True deps= -r{toxinidir}/tests/requirements.txt @@ -231,8 +235,11 @@ changedir= update_cluster: {toxinidir}/tests/functional/centos/7/cluster switch_to_containers: {toxinidir}/tests/functional/centos/7/cluster lvm_osds: {toxinidir}/tests/functional/centos/7/lvm-osds + lvm_osds_container: {toxinidir}/tests/functional/centos/7/lvm-osds-container lvm_batch: {toxinidir}/tests/functional/centos/7/lvm-batch + lvm_batch_container: {toxinidir}/tests/functional/centos/7/lvm-batch-container bluestore_lvm_osds: {toxinidir}/tests/functional/centos/7/bs-lvm-osds + bluestore_lvm_osds_container: {toxinidir}/tests/functional/centos/7/bs-lvm-osds-container purge_lvm_osds: {toxinidir}/tests/functional/centos/7/lvm-osds ooo_collocation: {toxinidir}/tests/functional/centos/7/ooo-collocation @@ -244,6 +251,7 @@ commands= bash {toxinidir}/tests/scripts/generate_ssh_config.sh {changedir} lvm_osds: ansible-playbook -vv -i {changedir}/hosts {toxinidir}/tests/functional/lvm_setup.yml + lvm_osds_container: ansible-playbook -vv -i {changedir}/hosts {toxinidir}/tests/functional/lvm_setup.yml bluestore_lvm_osds: ansible-playbook -vv -i {changedir}/hosts {toxinidir}/tests/functional/lvm_setup.yml purge_lvm_osds: ansible-playbook -vv -i {changedir}/hosts {toxinidir}/tests/functional/lvm_setup.yml -- 2.39.5