tests: add shrink-osd-legacy testing

This commit introduce back testing against ceph-disk deployed osds.

In stable-3.2 which is the most common version used at customers
(downstream pov), a bunch of OSDs are still deployed using ceph-disk.

Signed-off-by: Guillaume Abrioux <gabrioux@redhat.com>

diff --git a/tests/functional/shrink_osd_legacy/Vagrantfile b/tests/functional/shrink_osd_legacy/Vagrantfile
new file mode 120000 (symlink)
index 0000000..706a5bb
--- /dev/null
+++ b/tests/functional/shrink_osd_legacy/Vagrantfile
@@ -0,0 +1 @@
+../../../Vagrantfile
\ No newline at end of file

diff --git a/tests/functional/shrink_osd_legacy/ceph-override.json b/tests/functional/shrink_osd_legacy/ceph-override.json
new file mode 120000 (symlink)
index 0000000..fe2ff40
--- /dev/null
+++ b/tests/functional/shrink_osd_legacy/ceph-override.json
@@ -0,0 +1 @@
+../all_daemons/ceph-override.json
\ No newline at end of file

diff --git a/tests/functional/shrink_osd_legacy/container/Vagrantfile b/tests/functional/shrink_osd_legacy/container/Vagrantfile
new file mode 120000 (symlink)
index 0000000..16076e4
--- /dev/null
+++ b/tests/functional/shrink_osd_legacy/container/Vagrantfile
@@ -0,0 +1 @@
+../../../../Vagrantfile
\ No newline at end of file

diff --git a/tests/functional/shrink_osd_legacy/container/ceph-override.json b/tests/functional/shrink_osd_legacy/container/ceph-override.json
new file mode 120000 (symlink)
index 0000000..8417cc0
--- /dev/null
+++ b/tests/functional/shrink_osd_legacy/container/ceph-override.json
@@ -0,0 +1 @@
+../../all_daemons/ceph-override.json
\ No newline at end of file

diff --git a/tests/functional/shrink_osd_legacy/container/group_vars/all b/tests/functional/shrink_osd_legacy/container/group_vars/all
new file mode 100644 (file)
index 0000000..7b45071
--- /dev/null
+++ b/tests/functional/shrink_osd_legacy/container/group_vars/all
@@ -0,0 +1,15 @@
+---
+# this is only here to let the CI tests know
+# that this scenario is using docker
+docker: True
+
+containerized_deployment: True
+monitor_interface: eth1
+ceph_mon_docker_subnet: "{{ public_network }}"
+ceph_docker_on_openstack: False
+public_network: "192.168.57.0/24"
+cluster_network: "192.168.58.0/24"
+ceph_conf_overrides:
+  global:
+    osd_pool_default_size: 1
+openstack_config: False

diff --git a/tests/functional/shrink_osd_legacy/container/group_vars/osds b/tests/functional/shrink_osd_legacy/container/group_vars/osds
new file mode 100644 (file)
index 0000000..b9fbc70
--- /dev/null
+++ b/tests/functional/shrink_osd_legacy/container/group_vars/osds
@@ -0,0 +1,4 @@
+---
+ceph_osd_docker_run_script_path: /var/tmp
+journal_size: 100
+

diff --git a/tests/functional/shrink_osd_legacy/container/hosts b/tests/functional/shrink_osd_legacy/container/hosts
new file mode 100644 (file)
index 0000000..8318163
--- /dev/null
+++ b/tests/functional/shrink_osd_legacy/container/hosts
@@ -0,0 +1,10 @@
+[mons]
+mon0
+
+[mgrs]
+mon0
+
+[osds]
+osd0 osd_scenario=non-collocated devices="['/dev/sda', '/dev/sdb']" dedicated_devices="['/dev/sdc', '/dev/sdc']" osd_objectstore=bluestore dmcrypt=true
+osd1 osd_scenario=collocated devices="['/dev/sda', '/dev/sdb', '/dev/sdc']" osd_objectstore=bluestore
+osd2 osd_scenario=collocated devices="['/dev/sda', '/dev/sdb', '/dev/sdc']" osd_objectstore=filestore

diff --git a/tests/functional/shrink_osd_legacy/container/vagrant_variables.yml b/tests/functional/shrink_osd_legacy/container/vagrant_variables.yml
new file mode 100644 (file)
index 0000000..587155b
--- /dev/null
+++ b/tests/functional/shrink_osd_legacy/container/vagrant_variables.yml
@@ -0,0 +1,63 @@
+---
+
+# DEPLOY CONTAINERIZED DAEMONS
+docker: True
+
+# DEFINE THE NUMBER OF VMS TO RUN
+mon_vms: 1
+osd_vms: 3
+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: false
+
+# SUBNETS TO USE FOR THE VMS
+public_subnet: 192.168.57
+cluster_subnet: 192.168.58
+
+# 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
+#client_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

diff --git a/tests/functional/shrink_osd_legacy/group_vars/all b/tests/functional/shrink_osd_legacy/group_vars/all
new file mode 100644 (file)
index 0000000..dc39b6f
--- /dev/null
+++ b/tests/functional/shrink_osd_legacy/group_vars/all
@@ -0,0 +1,9 @@
+---
+ceph_origin: repository
+ceph_repository: community
+public_network: "192.168.51.0/24"
+cluster_network: "192.168.52.0/24"
+ceph_conf_overrides:
+  global:
+    osd_pool_default_size: 3
+openstack_config: False

diff --git a/tests/functional/shrink_osd_legacy/group_vars/osds b/tests/functional/shrink_osd_legacy/group_vars/osds
new file mode 100644 (file)
index 0000000..bae7ce2
--- /dev/null
+++ b/tests/functional/shrink_osd_legacy/group_vars/osds
@@ -0,0 +1,4 @@
+---
+os_tuning_params:
+  - { name: fs.file-max, value: 26234859 }
+journal_size: 100

diff --git a/tests/functional/shrink_osd_legacy/hosts b/tests/functional/shrink_osd_legacy/hosts
new file mode 100644 (file)
index 0000000..35b0082
--- /dev/null
+++ b/tests/functional/shrink_osd_legacy/hosts
@@ -0,0 +1,10 @@
+[mons]
+mon0 monitor_address=192.168.51.10
+
+[mgrs]
+mon0
+
+[osds]
+osd0 osd_scenario=non-collocated devices="['/dev/sda', '/dev/sdb']" dedicated_devices="['/dev/sdc', '/dev/sdc']" osd_objectstore=bluestore dmcrypt=true
+osd1 osd_scenario=collocated devices="['/dev/sda', '/dev/sdb', '/dev/sdc']" osd_objectstore=bluestore
+osd2 osd_scenario=collocated devices="['/dev/sda', '/dev/sdb', '/dev/sdc']" osd_objectstore=filestore
\ No newline at end of file

diff --git a/tests/functional/shrink_osd_legacy/vagrant_variables.yml b/tests/functional/shrink_osd_legacy/vagrant_variables.yml
new file mode 100644 (file)
index 0000000..85e5505
--- /dev/null
+++ b/tests/functional/shrink_osd_legacy/vagrant_variables.yml
@@ -0,0 +1,76 @@
+---
+
+# DEPLOY CONTAINERIZED DAEMONS
+docker: false
+
+# DEFINE THE NUMBER OF VMS TO RUN
+mon_vms: 1
+osd_vms: 3
+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: false
+
+# INSTALL SOURCE OF CEPH
+# valid values are 'stable' and 'dev'
+ceph_install_source: stable
+
+# SUBNETS TO USE FOR THE VMS
+public_subnet: 192.168.51
+cluster_subnet: 192.168.52
+
+# MEMORY
+# set 1024 for CentOS
+memory: 1024
+
+# Ethernet interface name
+# use eth1 for libvirt and ubuntu precise, enp0s8 for CentOS and ubuntu xenial
+eth: 'eth1'
+
+# Disks
+# For libvirt use disks: "[ '/dev/vdb', '/dev/vdc' ]"
+# For CentOS7 use disks: "[ '/dev/sda', '/dev/sdb' ]"
+disks: "[ '/dev/sdb', '/dev/sdc' ]"
+
+# VAGRANT BOX
+# Ceph boxes are *strongly* suggested. They are under better control and will
+# not get updated frequently unless required for build systems. These are (for
+# now):
+#
+# * ceph/ubuntu-xenial
+#
+# Ubuntu: ceph/ubuntu-xenial bento/ubuntu-16.04 or ubuntu/trusty64 or ubuntu/wily64
+# CentOS: bento/centos-7.1 or puppetlabs/centos-7.0-64-puppet
+# libvirt CentOS: centos/7
+# parallels Ubuntu: parallels/ubuntu-14.04
+# Debian: deb/jessie-amd64 - be careful the storage controller is named 'SATA Controller'
+# For more boxes have a look at:
+#   - https://atlas.hashicorp.com/boxes/search?utf8=✓&sort=&provider=virtualbox&q=
+#   - https://download.gluster.org/pub/gluster/purpleidea/vagrant/
+vagrant_box: centos/7
+#ssh_private_key_path: "~/.ssh/id_rsa"
+# The sync directory changes based on vagrant box
+# Set to /home/vagrant/sync for Centos/7, /home/{ user }/vagrant for openstack and defaults to /vagrant
+#vagrant_sync_dir: /home/vagrant/sync
+vagrant_sync_dir: /vagrant
+# Disables synced folder creation. Not needed for testing, will skip mounting
+# the vagrant directory on the remote box regardless of the provider.
+vagrant_disable_synced_folder: true
+# VAGRANT URL
+# This is a URL to download an image from an alternate location.  vagrant_box
+# above should be set to the filename of the image.
+# Fedora virtualbox: https://download.fedoraproject.org/pub/fedora/linux/releases/22/Cloud/x86_64/Images/Fedora-Cloud-Base-Vagrant-22-20150521.x86_64.vagrant-virtualbox.box
+# Fedora libvirt: https://download.fedoraproject.org/pub/fedora/linux/releases/22/Cloud/x86_64/Images/Fedora-Cloud-Base-Vagrant-22-20150521.x86_64.vagrant-libvirt.box
+# vagrant_box_url: https://download.fedoraproject.org/pub/fedora/linux/releases/22/Cloud/x86_64/Images/Fedora-Cloud-Base-Vagrant-22-20150521.x86_64.vagrant-virtualbox.box
+
+os_tuning_params:
+  - { name: fs.file-max, value: 26234859 }
+
+# VM prefix name, need to match the hostname
+# label_prefix: ceph

diff --git a/tox.ini b/tox.ini
index 6ca84c638490f8ec8dcb96e97335655e1497684d..e13b787e87f74b19e744bfbcb429eecf3f77a7de 100644 (file)
--- 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,lvm_auto_discovery}
+envlist = {centos,ubuntu}-{container,non_container}-{all_daemons,collocation,lvm_osds,shrink_mon,shrink_osd,shrink_osd_legacy,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
@@ -115,6 +115,16 @@ commands=
       osd_to_kill=0 \
   "
 
+[shrink-osd-legacy]
+commands=
+  ansible-playbook -vv -i {changedir}/{env:INVENTORY} {toxinidir}/infrastructure-playbooks/shrink-osd-ceph-disk.yml --extra-vars "\
+      ceph_docker_registry={env:CEPH_DOCKER_REGISTRY:docker.io} \
+      ceph_docker_image={env:CEPH_DOCKER_IMAGE:ceph/daemon} \
+      ceph_docker_image_tag={env:CEPH_DOCKER_IMAGE_TAG:latest-luminous} \
+      ireallymeanit=yes \
+      osd_to_kill=0,3 \
+  "
+
 [switch-to-containers]
 commands=
   cp {toxinidir}/infrastructure-playbooks/switch-from-non-containerized-to-containerized-ceph-daemons.yml {toxinidir}/switch-from-non-containerized-to-containerized-ceph-daemons.yml
@@ -202,6 +212,7 @@ setenv=
   non_container: PLAYBOOK = site.yml.sample
   shrink_mon: MON_TO_KILL = mon2
   shrink_osd: COPY_ADMIN_KEY = True
+  shrink_osd_legacy: COPY_ADMIN_KEY = True
   ooo_collocation: CEPH_DOCKER_IMAGE_TAG = v3.2.5-stable-3.2-luminous-centos-7
   CEPH_STABLE_RELEASE = luminous
 
@@ -211,6 +222,7 @@ changedir=
   cluster: {toxinidir}/tests/functional/all_daemons{env:CONTAINER_DIR:}
   shrink_mon: {toxinidir}/tests/functional/shrink_mon{env:CONTAINER_DIR:}
   shrink_osd: {toxinidir}/tests/functional/shrink_osd{env:CONTAINER_DIR:}
+  shrink_osd_legacy: {toxinidir}/tests/functional/shrink_osd_legacy{env:CONTAINER_DIR:}
   # tests a 1 mon, 1 osd, 1 mds and 1 rgw centos7 cluster using docker
   collocation: {toxinidir}/tests/functional/collocation{env:CONTAINER_DIR:}
   purge: {toxinidir}/tests/functional/all_daemons{env:CONTAINER_DIR:}
@@ -264,6 +276,7 @@ commands=
   switch_to_containers: {[switch-to-containers]commands}
   shrink_mon: {[shrink-mon]commands}
   shrink_osd: {[shrink-osd]commands}
+  shrink_osd_legacy: {[shrink-osd-legacy]commands}
   add_osds: {[add-osds]commands}
   rgw_multisite: {[rgw-multisite]commands}