test: add handler support

Add idempotency and handler test.

Signed-off-by: Sébastien Han <seb@redhat.com>

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

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

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

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

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

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

diff --git a/tests/functional/centos/7/cluster/ceph-override.json b/tests/functional/centos/7/cluster/ceph-override.json
new file mode 100644 (file)
index 0000000..9a3af94
--- /dev/null
+++ b/tests/functional/centos/7/cluster/ceph-override.json
@@ -0,0 +1,7 @@
+{
+       "ceph_conf_overrides": {
+               "global": {
+                       "osd_pool_default_pg_num": 12
+               }
+       }
+}

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

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

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

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

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

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

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

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

diff --git a/tox.ini b/tox.ini
index 53be8a1e8d0741a27284ff2f288c2099318be3fc..80020236e3a1b5b645e7a133b9383a72a4f6a191 100644 (file)
--- a/tox.ini
+++ b/tox.ini
@@ -228,6 +228,18 @@ commands=
   # retest to ensure cluster came back up correctly after rebooting
   testinfra -n 4 --sudo -v --connection=ansible --ansible-inventory={changedir}/hosts {toxinidir}/tests/functional/tests
 
+  # handlers/idempotency test
+  ansible-playbook -vv -i {changedir}/hosts {toxinidir}/{env:PLAYBOOK:site.yml.sample} \
+      --extra-vars "\
+      fetch_directory={env:FETCH_DIRECTORY:{changedir}/fetch} \
+      ceph_stable_release={env:CEPH_STABLE_RELEASE:luminous} \
+      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} " \
+      --extra-vars @ceph-override.json
+
   purge_cluster: {[purge]commands}
   purge_lvm_osds: {[purge-lvm]commands}
   purge_dmcrypt: {[purge]commands}