From c409d6e96008cd431f1679d2582325f174c47879 Mon Sep 17 00:00:00 2001 From: Dimitri Savineau Date: Thu, 5 Dec 2019 11:01:55 -0500 Subject: [PATCH] tests: add lvm-auto-discovery scenario This adds the lvm-auto-discovery scenario. Signed-off-by: Dimitri Savineau --- .../functional/lvm-auto-discovery/Vagrantfile | 1 + .../lvm-auto-discovery/ceph-override.json | 1 + .../lvm-auto-discovery/container/Vagrantfile | 1 + .../container/ceph-override.json | 1 + .../container/group_vars/all | 26 +++++++ .../lvm-auto-discovery/container/hosts | 8 ++ .../container/vagrant_variables.yml | 73 +++++++++++++++++++ .../lvm-auto-discovery/group_vars/all | 19 +++++ tests/functional/lvm-auto-discovery/hosts | 8 ++ .../lvm-auto-discovery/vagrant_variables.yml | 73 +++++++++++++++++++ tox.ini | 5 +- 11 files changed, 214 insertions(+), 2 deletions(-) create mode 120000 tests/functional/lvm-auto-discovery/Vagrantfile create mode 120000 tests/functional/lvm-auto-discovery/ceph-override.json create mode 120000 tests/functional/lvm-auto-discovery/container/Vagrantfile create mode 120000 tests/functional/lvm-auto-discovery/container/ceph-override.json create mode 100644 tests/functional/lvm-auto-discovery/container/group_vars/all create mode 100644 tests/functional/lvm-auto-discovery/container/hosts create mode 100644 tests/functional/lvm-auto-discovery/container/vagrant_variables.yml create mode 100644 tests/functional/lvm-auto-discovery/group_vars/all create mode 100644 tests/functional/lvm-auto-discovery/hosts create mode 100644 tests/functional/lvm-auto-discovery/vagrant_variables.yml diff --git a/tests/functional/lvm-auto-discovery/Vagrantfile b/tests/functional/lvm-auto-discovery/Vagrantfile new file mode 120000 index 000000000..706a5bb47 --- /dev/null +++ b/tests/functional/lvm-auto-discovery/Vagrantfile @@ -0,0 +1 @@ +../../../Vagrantfile \ No newline at end of file diff --git a/tests/functional/lvm-auto-discovery/ceph-override.json b/tests/functional/lvm-auto-discovery/ceph-override.json new file mode 120000 index 000000000..fe2ff40d6 --- /dev/null +++ b/tests/functional/lvm-auto-discovery/ceph-override.json @@ -0,0 +1 @@ +../all_daemons/ceph-override.json \ No newline at end of file diff --git a/tests/functional/lvm-auto-discovery/container/Vagrantfile b/tests/functional/lvm-auto-discovery/container/Vagrantfile new file mode 120000 index 000000000..16076e424 --- /dev/null +++ b/tests/functional/lvm-auto-discovery/container/Vagrantfile @@ -0,0 +1 @@ +../../../../Vagrantfile \ No newline at end of file diff --git a/tests/functional/lvm-auto-discovery/container/ceph-override.json b/tests/functional/lvm-auto-discovery/container/ceph-override.json new file mode 120000 index 000000000..8417cc0c9 --- /dev/null +++ b/tests/functional/lvm-auto-discovery/container/ceph-override.json @@ -0,0 +1 @@ +../../all_daemons/ceph-override.json \ No newline at end of file diff --git a/tests/functional/lvm-auto-discovery/container/group_vars/all b/tests/functional/lvm-auto-discovery/container/group_vars/all new file mode 100644 index 000000000..83ff32de5 --- /dev/null +++ b/tests/functional/lvm-auto-discovery/container/group_vars/all @@ -0,0 +1,26 @@ +--- + +# this is only here to let the CI tests know +# that this scenario is using docker +docker: True + +containerized_deployment: True +ceph_origin: repository +ceph_repository: community +cluster: ceph +public_network: "192.168.39.0/24" +cluster_network: "192.168.40.0/24" +monitor_interface: eth1 +radosgw_interface: eth1 +journal_size: 100 +osd_objectstore: "bluestore" +crush_device_class: test +osd_scenario: lvm +copy_admin_key: true +osd_auto_discovery: true +os_tuning_params: + - { name: fs.file-max, value: 26234859 } +ceph_conf_overrides: + global: + osd_pool_default_size: 1 +ceph_osd_docker_run_script_path: /var/tmp diff --git a/tests/functional/lvm-auto-discovery/container/hosts b/tests/functional/lvm-auto-discovery/container/hosts new file mode 100644 index 000000000..d6c89012a --- /dev/null +++ b/tests/functional/lvm-auto-discovery/container/hosts @@ -0,0 +1,8 @@ +[mons] +mon0 + +[mgrs] +mon0 + +[osds] +osd0 diff --git a/tests/functional/lvm-auto-discovery/container/vagrant_variables.yml b/tests/functional/lvm-auto-discovery/container/vagrant_variables.yml new file mode 100644 index 000000000..bd8309495 --- /dev/null +++ b/tests/functional/lvm-auto-discovery/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/lvm-auto-discovery/group_vars/all b/tests/functional/lvm-auto-discovery/group_vars/all new file mode 100644 index 000000000..278ca40b9 --- /dev/null +++ b/tests/functional/lvm-auto-discovery/group_vars/all @@ -0,0 +1,19 @@ +--- + +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 +osd_objectstore: "bluestore" +crush_device_class: test +osd_scenario: lvm +copy_admin_key: true +osd_auto_discovery: true +os_tuning_params: + - { name: fs.file-max, value: 26234859 } +ceph_conf_overrides: + global: + osd_pool_default_size: 1 diff --git a/tests/functional/lvm-auto-discovery/hosts b/tests/functional/lvm-auto-discovery/hosts new file mode 100644 index 000000000..d6c89012a --- /dev/null +++ b/tests/functional/lvm-auto-discovery/hosts @@ -0,0 +1,8 @@ +[mons] +mon0 + +[mgrs] +mon0 + +[osds] +osd0 diff --git a/tests/functional/lvm-auto-discovery/vagrant_variables.yml b/tests/functional/lvm-auto-discovery/vagrant_variables.yml new file mode 100644 index 000000000..342ce5f9c --- /dev/null +++ b/tests/functional/lvm-auto-discovery/vagrant_variables.yml @@ -0,0 +1,73 @@ +--- + +# 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.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/7 +#ssh_private_key_path: "~/.ssh/id_rsa" +# The sync directory changes based on vagrant box +# Set to /home/vagrant/sync for Centos/7, /home/{ user }/vagrant for openstack and defaults to /vagrant +#vagrant_sync_dir: /home/vagrant/sync +vagrant_sync_dir: /vagrant +# Disables synced folder creation. Not needed for testing, will skip mounting +# the vagrant directory on the remote box regardless of the provider. +vagrant_disable_synced_folder: true +# VAGRANT URL +# This is a URL to download an image from an alternate location. vagrant_box +# above should be set to the filename of the image. +# Fedora virtualbox: https://download.fedoraproject.org/pub/fedora/linux/releases/22/Cloud/x86_64/Images/Fedora-Cloud-Base-Vagrant-22-20150521.x86_64.vagrant-virtualbox.box +# Fedora libvirt: https://download.fedoraproject.org/pub/fedora/linux/releases/22/Cloud/x86_64/Images/Fedora-Cloud-Base-Vagrant-22-20150521.x86_64.vagrant-libvirt.box +# vagrant_box_url: https://download.fedoraproject.org/pub/fedora/linux/releases/22/Cloud/x86_64/Images/Fedora-Cloud-Base-Vagrant-22-20150521.x86_64.vagrant-virtualbox.box + +os_tuning_params: + - { name: fs.file-max, value: 26234859 } diff --git a/tox.ini b/tox.ini index 768d4a926..6ca84c638 100644 --- a/tox.ini +++ b/tox.ini @@ -1,5 +1,5 @@ [tox] -envlist = {centos,ubuntu}-{container,non_container}-{all_daemons,collocation,lvm_osds,shrink_mon,shrink_osd,lvm_batch,add_osds,rgw_multisite,purge} +envlist = {centos,ubuntu}-{container,non_container}-{all_daemons,collocation,lvm_osds,shrink_mon,shrink_osd,lvm_batch,add_osds,rgw_multisite,purge,lvm_auto_discovery} {centos,ubuntu}-non_container-switch_to_containers {centos,ubuntu}-container-{cluster,ooo_collocation,infra_lv_create} infra_lv_create @@ -217,6 +217,7 @@ changedir= switch_to_containers: {toxinidir}/tests/functional/all_daemons lvm_osds: {toxinidir}/tests/functional/lvm-osds{env:CONTAINER_DIR:} lvm_batch: {toxinidir}/tests/functional/lvm-batch{env:CONTAINER_DIR:} + lvm_auto_discovery: {toxinidir}/tests/functional/lvm-auto-discovery{env:CONTAINER_DIR:} ooo_collocation: {toxinidir}/tests/functional/ooo-collocation add_osds: {toxinidir}/tests/functional/add-osds{env:CONTAINER_DIR:} rgw_multisite: {toxinidir}/tests/functional/rgw-multisite{env:CONTAINER_DIR:} @@ -228,7 +229,7 @@ commands= bash {toxinidir}/tests/scripts/generate_ssh_config.sh {changedir} # configure lvm - !lvm_batch: ansible-playbook -vv -i {changedir}/{env:INVENTORY} {toxinidir}/tests/functional/lvm_setup.yml + !lvm_batch-!lvm_auto_discovery: ansible-playbook -vv -i {changedir}/{env:INVENTORY} {toxinidir}/tests/functional/lvm_setup.yml rhcs: ansible-playbook -vv -i {changedir}/{env:INVENTORY} {toxinidir}/tests/functional/rhcs_setup.yml --extra-vars "ceph_docker_registry={env:CEPH_DOCKER_REGISTRY:docker.io} repo_url={env:REPO_URL:} rhel7_repo_url={env:RHEL7_REPO_URL:}" --skip-tags "vagrant_setup"