tests: add tests for day-2-operation playbook

Adding testing scenarios for day-2-operation playbook.

Steps:
- deploys a cluster,
- run testinfra,
- test idempotency,
- add a new osd node,
- run testinfra

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

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

diff --git a/tests/functional/centos/7/add-osds-container/ceph-override.json b/tests/functional/centos/7/add-osds-container/ceph-override.json
new file mode 120000 (symlink)
index 0000000..775cb00
--- /dev/null
+++ b/tests/functional/centos/7/add-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/add-osds-container/group_vars/all b/tests/functional/centos/7/add-osds-container/group_vars/all
new file mode 100644 (file)
index 0000000..c5e1575
--- /dev/null
+++ b/tests/functional/centos/7/add-osds-container/group_vars/all
@@ -0,0 +1,21 @@
+---
+ceph_origin: repository
+ceph_repository: community
+cluster: ceph
+public_network: "192.168.55.0/24"
+cluster_network: "192.168.56.0/24"
+monitor_interface: eth1
+radosgw_interface: eth1
+journal_size: 100
+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: /dev/sda
+  - data: /dev/sdb
+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/add-osds-container/hosts b/tests/functional/centos/7/add-osds-container/hosts
new file mode 100644 (file)
index 0000000..d6c8901
--- /dev/null
+++ b/tests/functional/centos/7/add-osds-container/hosts
@@ -0,0 +1,8 @@
+[mons]
+mon0
+
+[mgrs]
+mon0
+
+[osds]
+osd0

diff --git a/tests/functional/centos/7/add-osds-container/hosts-2 b/tests/functional/centos/7/add-osds-container/hosts-2
new file mode 100644 (file)
index 0000000..288617e
--- /dev/null
+++ b/tests/functional/centos/7/add-osds-container/hosts-2
@@ -0,0 +1,9 @@
+[mons]
+mon0
+
+[mgrs]
+mon0
+
+[osds]
+osd0
+osd1

diff --git a/tests/functional/centos/7/add-osds-container/vagrant_variables.yml b/tests/functional/centos/7/add-osds-container/vagrant_variables.yml
new file mode 100644 (file)
index 0000000..1e72ca2
--- /dev/null
+++ b/tests/functional/centos/7/add-osds-container/vagrant_variables.yml
@@ -0,0 +1,73 @@
+---
+
+# DEPLOY CONTAINERIZED DAEMONS
+docker: false
+
+# DEFINE THE NUMBER OF VMS TO RUN
+mon_vms: 1
+osd_vms: 2
+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.53
+cluster_subnet: 192.168.56
+
+# 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/tests/functional/centos/7/add-osds/Vagrantfile b/tests/functional/centos/7/add-osds/Vagrantfile
new file mode 120000 (symlink)
index 0000000..dfd7436
--- /dev/null
+++ b/tests/functional/centos/7/add-osds/Vagrantfile
@@ -0,0 +1 @@
+../../../../../Vagrantfile
\ No newline at end of file

diff --git a/tests/functional/centos/7/add-osds/ceph-override.json b/tests/functional/centos/7/add-osds/ceph-override.json
new file mode 120000 (symlink)
index 0000000..775cb00
--- /dev/null
+++ b/tests/functional/centos/7/add-osds/ceph-override.json
@@ -0,0 +1 @@
+../cluster/ceph-override.json
\ No newline at end of file

diff --git a/tests/functional/centos/7/add-osds/group_vars/all b/tests/functional/centos/7/add-osds/group_vars/all
new file mode 100644 (file)
index 0000000..6896bd9
--- /dev/null
+++ b/tests/functional/centos/7/add-osds/group_vars/all
@@ -0,0 +1,21 @@
+---
+ceph_origin: repository
+ceph_repository: community
+cluster: ceph
+public_network: "192.168.53.0/24"
+cluster_network: "192.168.54.0/24"
+monitor_interface: eth1
+radosgw_interface: eth1
+journal_size: 100
+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: /dev/sda
+  - data: /dev/sdb
+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/add-osds/hosts b/tests/functional/centos/7/add-osds/hosts
new file mode 100644 (file)
index 0000000..d6c8901
--- /dev/null
+++ b/tests/functional/centos/7/add-osds/hosts
@@ -0,0 +1,8 @@
+[mons]
+mon0
+
+[mgrs]
+mon0
+
+[osds]
+osd0

diff --git a/tests/functional/centos/7/add-osds/hosts-2 b/tests/functional/centos/7/add-osds/hosts-2
new file mode 100644 (file)
index 0000000..288617e
--- /dev/null
+++ b/tests/functional/centos/7/add-osds/hosts-2
@@ -0,0 +1,9 @@
+[mons]
+mon0
+
+[mgrs]
+mon0
+
+[osds]
+osd0
+osd1

diff --git a/tests/functional/centos/7/add-osds/vagrant_variables.yml b/tests/functional/centos/7/add-osds/vagrant_variables.yml
new file mode 100644 (file)
index 0000000..2705895
--- /dev/null
+++ b/tests/functional/centos/7/add-osds/vagrant_variables.yml
@@ -0,0 +1,73 @@
+---
+
+# DEPLOY CONTAINERIZED DAEMONS
+docker: false
+
+# DEFINE THE NUMBER OF VMS TO RUN
+mon_vms: 1
+osd_vms: 2
+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.53
+cluster_subnet: 192.168.54
+
+# 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 5d8b0ffdc8d2a167f21993856254969f81088daf..6121e617552a0107ce515a609082578197f421f3 100644 (file)
--- a/tox.ini
+++ b/tox.ini
@@ -1,5 +1,5 @@
 [tox]
-envlist = {dev,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,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}
+envlist = {dev,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,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,add_osds,add_osds_container}
   infra_lv_create
 
 skipsdist = True
@@ -144,6 +144,22 @@ commands=
 
   testinfra -n 4 --sudo -v --connection=ansible --ansible-inventory={changedir}/hosts-switch-to-containers {toxinidir}/tests/functional/tests
 
+[add-osds]
+commands=
+  ansible-playbook -vv -i {changedir}/hosts-2 --limit osd1 {toxinidir}/tests/functional/setup.yml
+  cp {toxinidir}/infrastructure-playbooks/add-osd.yml {toxinidir}/add-osd.yml
+  ansible-playbook -vv -i {changedir}/hosts-2 --limit osd1 {toxinidir}/add-osd.yml --extra-vars "\
+      ireallymeanit=yes \
+      fetch_directory={env:FETCH_DIRECTORY:{changedir}/fetch} \
+      ceph_stable_release={env:CEPH_STABLE_RELEASE:mimic} \
+      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} \
+      ceph_dev_branch={env:CEPH_DEV_BRANCH:master} \
+      ceph_dev_sha1={env:CEPH_DEV_SHA1:latest} \
+      "
+  testinfra -n 4 --sudo -v --connection=ansible --ansible-inventory={changedir}/hosts-2 {toxinidir}/tests/functional/tests
+
 [testenv]
 whitelist_externals =
     vagrant
@@ -151,6 +167,7 @@ whitelist_externals =
     pip
     cp
     sleep
+    rm
 passenv=*
 sitepackages=True
 setenv=
@@ -172,6 +189,8 @@ setenv=
   purge_bluestore_osds_container: PURGE_PLAYBOOK = purge-docker-cluster.yml
   purge_filestore_osds_container: PLAYBOOK = site-docker.yml.sample
   purge_filestore_osds_container: PURGE_PLAYBOOK = purge-docker-cluster.yml
+  add_osds: PLAYBOOK = site.yml.sample
+  add_osds_container: PLAYBOOK = site-docker.yml.sample
 
   filestore_osds_container: PLAYBOOK = site-docker.yml.sample
   bluestore_osds_container: PLAYBOOK = site-docker.yml.sample
@@ -203,6 +222,8 @@ setenv=
   lvm_batch_container: CEPH_STABLE_RELEASE = luminous
   update_cluster: ROLLING_UPDATE = True
   update_docker_cluster: ROLLING_UPDATE = True
+  add_osds: CEPH_STABLE_RELEASE = luminous
+  add_osds_container: CEPH_STABLE_RELEASE = luminous
 deps= -r{toxinidir}/tests/requirements.txt
 changedir=
   # tests a 1 mon, 1 osd, 1 mds and 1 rgw xenial cluster using non-collocated OSD scenario
@@ -239,6 +260,8 @@ changedir=
   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
+  add_osds: {toxinidir}/tests/functional/centos/7/add-osds
+  add_osds_container: {toxinidir}/tests/functional/centos/7/add-osds-container
 
 commands=
   rhcs: ansible-playbook -vv -i "localhost," -c local {toxinidir}/tests/functional/rhcs_setup.yml --extra-vars "change_dir={changedir}" --tags "vagrant_setup"
@@ -312,5 +335,7 @@ commands=
   shrink_mon_container: {[shrink-mon]commands}
   shrink_osd: {[shrink-osd]commands}
   shrink_osd_container: {[shrink-osd]commands}
+  add_osds: {[add-osds]commands}
+  add_osds_container: {[add-osds]commands}
 
   vagrant destroy --force