tests/functional: add a test for shrink-mgr.yml

Add a new functional test that deploys a Ceph cluster with three nodes
for MON, OSD and MGR and then runs shrink-mgr.yml to test it.

Signed-off-by: Rishabh Dave <ridave@redhat.com>
(cherry picked from commit 5c95c34d4be5ef545c09d03f4bd1124901119f04)

# Conflicts:
#	tox.ini

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

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

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

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

diff --git a/tests/functional/shrink_mgr/container/group_vars/all b/tests/functional/shrink_mgr/container/group_vars/all
new file mode 100644 (file)
index 0000000..618aa44
--- /dev/null
+++ b/tests/functional/shrink_mgr/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' if ansible_distribution == 'CentOS' else 'ens6' }}"
+ceph_mon_docker_subnet: "{{ public_network }}"
+ceph_docker_on_openstack: False
+public_network: "192.168.83.0/24"
+cluster_network: "192.168.84.0/24"
+ceph_conf_overrides:
+  global:
+    osd_pool_default_size: 1
+openstack_config: False

diff --git a/tests/functional/shrink_mgr/container/group_vars/mons b/tests/functional/shrink_mgr/container/group_vars/mons
new file mode 100644 (file)
index 0000000..0e67979
--- /dev/null
+++ b/tests/functional/shrink_mgr/container/group_vars/mons
@@ -0,0 +1,3 @@
+---
+create_crush_tree: False
+crush_rule_config: False
\ No newline at end of file

diff --git a/tests/functional/shrink_mgr/container/group_vars/osds b/tests/functional/shrink_mgr/container/group_vars/osds
new file mode 100644 (file)
index 0000000..9cea91d
--- /dev/null
+++ b/tests/functional/shrink_mgr/container/group_vars/osds
@@ -0,0 +1,10 @@
+---
+ceph_osd_docker_run_script_path: /var/tmp
+osd_objectstore: "bluestore"
+lvm_volumes:
+  - data: data-lv1
+    data_vg: test_group
+  - data: data-lv2
+    data_vg: test_group
+    db: journal1
+    db_vg: journals
\ No newline at end of file

diff --git a/tests/functional/shrink_mgr/container/hosts b/tests/functional/shrink_mgr/container/hosts
new file mode 100644 (file)
index 0000000..ae0f0f9
--- /dev/null
+++ b/tests/functional/shrink_mgr/container/hosts
@@ -0,0 +1,9 @@
+[mons]
+mon0
+
+[osds]
+osd0
+
+[mgrs]
+mgr0
+mgr1

diff --git a/tests/functional/shrink_mgr/container/vagrant_variables.yml b/tests/functional/shrink_mgr/container/vagrant_variables.yml
new file mode 100644 (file)
index 0000000..d0b8529
--- /dev/null
+++ b/tests/functional/shrink_mgr/container/vagrant_variables.yml
@@ -0,0 +1,61 @@
+---
+
+# 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
+grafana_server_vms: 0
+rbd_mirror_vms: 0
+client_vms: 0
+iscsi_gw_vms: 0
+mgr_vms: 2
+
+# SUBNETS TO USE FOR THE VMS
+public_subnet: 192.168.83
+cluster_subnet: 192.168.84
+
+# 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_mgr/group_vars/all b/tests/functional/shrink_mgr/group_vars/all
new file mode 100644 (file)
index 0000000..ca96be5
--- /dev/null
+++ b/tests/functional/shrink_mgr/group_vars/all
@@ -0,0 +1,10 @@
+---
+ceph_origin: repository
+ceph_repository: dev
+public_network: "192.168.81.0/24"
+cluster_network: "192.168.82.0/24"
+monitor_interface: eth1
+radosgw_interface: eth1
+ceph_conf_overrides:
+  global:
+    osd_pool_default_size: 1

diff --git a/tests/functional/shrink_mgr/group_vars/mons b/tests/functional/shrink_mgr/group_vars/mons
new file mode 100644 (file)
index 0000000..0e67979
--- /dev/null
+++ b/tests/functional/shrink_mgr/group_vars/mons
@@ -0,0 +1,3 @@
+---
+create_crush_tree: False
+crush_rule_config: False
\ No newline at end of file

diff --git a/tests/functional/shrink_mgr/group_vars/osds b/tests/functional/shrink_mgr/group_vars/osds
new file mode 100644 (file)
index 0000000..3ec1d6e
--- /dev/null
+++ b/tests/functional/shrink_mgr/group_vars/osds
@@ -0,0 +1,11 @@
+---
+os_tuning_params:
+  - { name: fs.file-max, value: 26234859 }
+osd_objectstore: "bluestore"
+lvm_volumes:
+  - data: data-lv1
+    data_vg: test_group
+  - data: data-lv2
+    data_vg: test_group
+    db: journal1
+    db_vg: journals
\ No newline at end of file

diff --git a/tests/functional/shrink_mgr/hosts b/tests/functional/shrink_mgr/hosts
new file mode 100644 (file)
index 0000000..ae0f0f9
--- /dev/null
+++ b/tests/functional/shrink_mgr/hosts
@@ -0,0 +1,9 @@
+[mons]
+mon0
+
+[osds]
+osd0
+
+[mgrs]
+mgr0
+mgr1

diff --git a/tests/functional/shrink_mgr/hosts-2 b/tests/functional/shrink_mgr/hosts-2
new file mode 100644 (file)
index 0000000..6404712
--- /dev/null
+++ b/tests/functional/shrink_mgr/hosts-2
@@ -0,0 +1,8 @@
+[mons]
+mon0
+
+[osds]
+osd0
+
+[mgrs]
+mgr0

diff --git a/tests/functional/shrink_mgr/vagrant_variables.yml b/tests/functional/shrink_mgr/vagrant_variables.yml
new file mode 100644 (file)
index 0000000..413a476
--- /dev/null
+++ b/tests/functional/shrink_mgr/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
+grafana_server_vms: 0
+rbd_mirror_vms: 0
+client_vms: 0
+iscsi_gw_vms: 0
+mgr_vms: 2
+
+# INSTALL SOURCE OF CEPH
+# valid values are 'stable' and 'dev'
+ceph_install_source: stable
+
+# SUBNETS TO USE FOR THE VMS
+public_subnet: 192.168.81
+cluster_subnet: 192.168.82
+
+# 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 41e8b2660b63a314c043ee80799483f27134dc14..b0728ef6293599782a2ef0f34b4cfb58de744b6f 100644 (file)
--- a/tox.ini
+++ b/tox.ini
@@ -1,5 +1,5 @@
 [tox]
-envlist = {nautilus,rhcs}-{centos,ubuntu}-{container,non_container}-{all_daemons,collocation,lvm_osds,shrink_mon,shrink_osd,shrink_mds,lvm_batch,add_mons,add_osds,add_mgrs,add_mdss,add_rbdmirrors,add_rgws,rgw_multisite,purge,storage_inventory,lvm_auto_discovery}
+envlist = {nautilus,rhcs}-{centos,ubuntu}-{container,non_container}-{all_daemons,collocation,lvm_osds,shrink_mon,shrink_osd,shrink_mgr,shrink_mds,lvm_batch,add_mons,add_osds,add_mgrs,add_mdss,add_rbdmirrors,add_rgws,rgw_multisite,purge,storage_inventory,lvm_auto_discovery}
   {nautilus,rhcs}-{centos,ubuntu}-container-{ooo_collocation}
   {nautilus,rhcs}-{centos,ubuntu}-non_container-{switch_to_containers}
   infra_lv_create
@@ -179,6 +179,15 @@ commands=
       ceph_docker_image_tag={env:CEPH_DOCKER_IMAGE_TAG:latest-master} \
   "
 
+[shrink-mgr]
+commands=
+  ansible-playbook -vv -i {changedir}/{env:INVENTORY} {toxinidir}/infrastructure-playbooks/shrink-mgr.yml --extra-vars "\
+      ireallymeanit=yes \
+      mgr_to_kill=mgr1 \
+      ceph_docker_image_tag={env:CEPH_DOCKER_IMAGE_TAG:latest-master} \
+  "
+  py.test --reruns 5 --reruns-delay 1 -n 8 --durations=0 --sudo -v --connection=ansible --ansible-inventory={changedir}/hosts-2 --ssh-config={changedir}/vagrant_ssh_config {toxinidir}/tests/functional/tests
+
 [shrink-mds]
 commands=
   ansible-playbook -vv -i {changedir}/{env:INVENTORY} {toxinidir}/infrastructure-playbooks/shrink-mds.yml --extra-vars "\
@@ -355,6 +364,7 @@ setenv=
   non_container: PLAYBOOK = site.yml.sample
   shrink_mon: MON_TO_KILL = mon2
   shrink_osd: COPY_ADMIN_KEY = True
+  shrink_mgr: MGR_TO_KILL = mgr1
   shrink_mds: COPY_ADMIN_KEY = True
 
   rhcs: CEPH_STABLE_RELEASE = luminous
@@ -372,7 +382,9 @@ changedir=
   all_daemons: {toxinidir}/tests/functional/all_daemons{env:CONTAINER_DIR:}
   cluster: {toxinidir}/tests/functional/all_daemons{env:CONTAINER_DIR:}
   shrink_mon: {toxinidir}/tests/functional/shrink_mon{env:CONTAINER_DIR:}
+  shrink_mgn: {toxinidir}/tests/functional/shrink_mon{env:CONTAINER_DIR:}
   shrink_osd: {toxinidir}/tests/functional/shrink_osd{env:CONTAINER_DIR:}
+  shrink_mgr: {toxinidir}/tests/functional/shrink_mgr{env:CONTAINER_DIR:}
   shrink_mds: {toxinidir}/tests/functional/shrink_mds{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:}
@@ -434,6 +446,7 @@ commands=
   switch_to_containers: {[switch-to-containers]commands}
   shrink_mon: {[shrink-mon]commands}
   shrink_osd: {[shrink-osd]commands}
+  shrink_mgr: {[shrink-mgr]commands}
   shrink_mds: {[shrink-mds]commands}
   add_osds: {[add-osds]commands}
   add_mons: {[add-mons]commands}