tox: update shrink scenario configuration

The shrink scenarios don't need the docker variables (except for OSD).
Removing pytest for shrink-mgr.
Adding environment variables for xxx_to_kill ansible variable.

Signed-off-by: Dimitri Savineau <dsavinea@redhat.com>

diff --git a/tox.ini b/tox.ini
index 60de5093ec6cce95b9074bcea8f5f99b3791422c..7c286ddc6a284d0fd5c417454efdcae4bc82506d 100644 (file)
--- a/tox.ini
+++ b/tox.ini
@@ -177,13 +177,12 @@ commands=
   ansible-playbook -vv -i {changedir}/{env:INVENTORY} {toxinidir}/infrastructure-playbooks/shrink-mon.yml --extra-vars "\
       ireallymeanit=yes \
       mon_to_kill={env:MON_TO_KILL:mon2} \
-      ceph_docker_image_tag={env:CEPH_DOCKER_IMAGE_TAG:latest-master} \
   "
 [shrink-osd]
 commands=
   ansible-playbook -vv -i {changedir}/{env:INVENTORY} {toxinidir}/infrastructure-playbooks/shrink-osd.yml --extra-vars "\
       ireallymeanit=yes \
-      osd_to_kill=0 \
+      osd_to_kill={env:OSD_TO_KILL:0} \
       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-master} \
@@ -193,39 +192,28 @@ commands=
 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} \
+      mgr_to_kill={env:MGR_TO_KILL:mgr1} \
   "
-  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 "\
       ireallymeanit=yes \
-      mds_to_kill=mds0 \
-      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-master} \
+      mds_to_kill={env:MDS_TO_KILL:mds0} \
   "
 
 [shrink-rbdmirror]
 commands=
   ansible-playbook -vv -i {changedir}/{env:INVENTORY} {toxinidir}/infrastructure-playbooks/shrink-rbdmirror.yml --extra-vars "\
       ireallymeanit=yes \
-      rbdmirror_to_kill=rbd-mirror0 \
-      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-master} \
+      rbdmirror_to_kill={env:RBDMIRROR_TO_KILL:rbd-mirror0} \
   "
 
 [shrink-rgw]
 commands=
   ansible-playbook -vv -i {changedir}/{env:INVENTORY} {toxinidir}/infrastructure-playbooks/shrink-rgw.yml --extra-vars "\
       ireallymeanit=yes \
-      rgw_to_kill=rgw0.rgw0 \
-      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-master} \
+      rgw_to_kill={env:RGW_TO_KILL:rgw0.rgw0} \
   "
 
 [switch-to-containers]
@@ -396,8 +384,12 @@ setenv=
   container: PLAYBOOK = site-docker.yml.sample
   container: PURGE_PLAYBOOK = purge-container-cluster.yml
   non_container: PLAYBOOK = site.yml.sample
-  shrink_mon: MON_TO_KILL = mon2
+  shrink_mds: MDS_TO_KILL = mds0
   shrink_mgr: MGR_TO_KILL = mgr1
+  shrink_mon: MON_TO_KILL = mon2
+  shrink_osd: OSD_TO_KILL = 0
+  shrink_rbdmirror: RBDMIRROR_TO_KILL = rbd-mirror0
+  shrink_rgw: RGW_TO_KILL = rgw0.rgw0
 
   lvm_osds: CEPH_STABLE_RELEASE = luminous