]> git-server-git.apps.pok.os.sepia.ceph.com Git - ceph-ansible.git/commitdiff
tests: use docker playbook when redeploying a purged cluster 1585/head
authorAndrew Schoen <aschoen@redhat.com>
Wed, 31 May 2017 16:53:37 +0000 (11:53 -0500)
committerAndrew Schoen <aschoen@redhat.com>
Mon, 5 Jun 2017 14:34:26 +0000 (09:34 -0500)
When we purge a containerized cluster we need to use the correct
playbook when redploying the cluster.

Signed-off-by: Andrew Schoen <aschoen@redhat.com>
(cherry picked from commit 22541a9c9a05bee2c2e24a8c4e75bf5870abe943)

Conflicts:
tox.ini

tox.ini

diff --git a/tox.ini b/tox.ini
index 1ef4353dae602edc483d4bd83ad3c8a2fb5dd682..785ef109e4409fd820193eddaaed5d7717cebefa 100644 (file)
--- a/tox.ini
+++ b/tox.ini
@@ -19,8 +19,8 @@ commands=
       ceph_docker_image_tag={env:CEPH_DOCKER_IMAGE_TAG:latest} \
   "
   # set up the cluster again
-  ansible-playbook -vv -i {changedir}/hosts {toxinidir}/site.yml.sample --extra-vars "\
-      ceph_stable_release={env:CEPH_STABLE_RELEASE:jewel} \
+  ansible-playbook -vv -i {changedir}/hosts {toxinidir}/{env:PLAYBOOK:site.yml.sample} --extra-vars "\
+      ceph_stable_release={env:CEPH_STABLE_RELEASE:kraken} \
       fetch_directory={env:FETCH_DIRECTORY:{changedir}/fetch} \
       ceph_docker_registry={env:CEPH_DOCKER_REGISTRY:docker.io} \
       ceph_docker_image={env:CEPH_DOCKER_IMAGE:ceph/daemon} \