From 4013316c0122e999ca76e38467efc1e44886aa18 Mon Sep 17 00:00:00 2001 From: Andrew Schoen Date: Wed, 31 May 2017 11:53:37 -0500 Subject: [PATCH] tests: use docker playbook when redeploying a purged cluster When we purge a containerized cluster we need to use the correct playbook when redploying the cluster. Signed-off-by: Andrew Schoen (cherry picked from commit 22541a9c9a05bee2c2e24a8c4e75bf5870abe943) Conflicts: tox.ini --- tox.ini | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/tox.ini b/tox.ini index 1ef4353da..785ef109e 100644 --- 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} \