tests: reformat tox.ini for better readability

Signed-off-by: Andrew Schoen <aschoen@redhat.com>

diff --git a/tox.ini b/tox.ini
index 7118385ceda9e8dff230d29ab4549db84e939f36..bc4ba3d6190bde6a777371f4e72fd4498e974d02 100644 (file)
--- a/tox.ini
+++ b/tox.ini
@@ -9,11 +9,24 @@ skipsdist = True
 [purge]
 commands=
   cp {toxinidir}/infrastructure-playbooks/purge-cluster.yml {toxinidir}/purge-cluster.yml
-  ansible-playbook -vv -i {changedir}/hosts {toxinidir}/purge-cluster.yml \
-      --extra-vars="ireallymeanit=yes fetch_directory={changedir}/fetch ceph_rhcs={env:USE_CEPH_RHCS:false} ceph_origin={env:CEPH_ORIGIN:upstream} ceph_dev={env:CEPH_DEV:false} ceph_dev_branch={env:CEPH_DEV_BRANCH:master} ceph_dev_sha1={env:CEPH_DEV_SHA1:latest} ceph_stable_release={env:CEPH_STABLE_RELEASE:jewel}"
+  ansible-playbook -vv -i {changedir}/hosts {toxinidir}/purge-cluster.yml --extra-vars="\
+      ireallymeanit=yes \
+      fetch_directory={changedir}/fetch \
+      ceph_rhcs={env:USE_CEPH_RHCS:false} \
+      ceph_origin={env:CEPH_ORIGIN:upstream} \
+      ceph_dev={env:CEPH_DEV:false} \
+      ceph_dev_branch={env:CEPH_DEV_BRANCH:master} \
+      ceph_dev_sha1={env:CEPH_DEV_SHA1:latest} \
+      ceph_stable_release={env:CEPH_STABLE_RELEASE:jewel}"
   # set up the cluster again
-  ansible-playbook -vv -i {changedir}/hosts {toxinidir}/site.yml.sample \
-      --extra-vars="fetch_directory={changedir}/fetch ceph_rhcs={env:USE_CEPH_RHCS:false} ceph_origin={env:CEPH_ORIGIN:upstream} ceph_dev={env:CEPH_DEV:false} ceph_dev_branch={env:CEPH_DEV_BRANCH:master} ceph_dev_sha1={env:CEPH_DEV_SHA1:latest} ceph_stable_release={env:CEPH_STABLE_RELEASE:jewel}"
+  ansible-playbook -vv -i {changedir}/hosts {toxinidir}/site.yml.sample --extra-vars="\
+      fetch_directory={changedir}/fetch \
+      ceph_rhcs={env:USE_CEPH_RHCS:false} \
+      ceph_origin={env:CEPH_ORIGIN:upstream} \
+      ceph_dev={env:CEPH_DEV:false} \
+      ceph_dev_branch={env:CEPH_DEV_BRANCH:master} \
+      ceph_dev_sha1={env:CEPH_DEV_SHA1:latest} \
+      ceph_stable_release={env:CEPH_STABLE_RELEASE:jewel}"
   # test that the cluster can be redeployed in a healthy state
   testinfra -n 4 --sudo -v --connection=ansible --ansible-inventory={changedir}/hosts {toxinidir}/tests/functional/tests
 
@@ -23,8 +36,15 @@ commands=
 [update]
 commands=
   cp {toxinidir}/infrastructure-playbooks/rolling_update.yml {toxinidir}/rolling_update.yml
-  ansible-playbook -vv -i {changedir}/hosts {toxinidir}/rolling_update.yml \
-      --extra-vars="ceph_stable_release={env:UPDATE_CEPH_STABLE_RELEASE:kraken} ireallymeanit=yes fetch_directory={changedir}/fetch ceph_rhcs={env:USE_CEPH_RHCS:false} ceph_origin={env:CEPH_ORIGIN:upstream} ceph_dev={env:CEPH_DEV:false} ceph_dev_branch={env:UPDATE_CEPH_DEV_BRANCH:master} ceph_dev_sha1={env:UPDATE_CEPH_DEV_SHA1:latest}"
+  ansible-playbook -vv -i {changedir}/hosts {toxinidir}/rolling_update.yml --extra-vars="\
+      ceph_stable_release={env:UPDATE_CEPH_STABLE_RELEASE:kraken} \
+      ireallymeanit=yes \
+      fetch_directory={changedir}/fetch \
+      ceph_rhcs={env:USE_CEPH_RHCS:false} \
+      ceph_origin={env:CEPH_ORIGIN:upstream} \
+      ceph_dev={env:CEPH_DEV:false} \
+      ceph_dev_branch={env:UPDATE_CEPH_DEV_BRANCH:master} \
+      ceph_dev_sha1={env:UPDATE_CEPH_DEV_SHA1:latest}"
 
   testinfra -n 4 --sudo -v --connection=ansible --ansible-inventory={changedir}/hosts {toxinidir}/tests/functional/tests
 
@@ -71,8 +91,14 @@ commands=
   vagrant up --no-provision {posargs:--provider=virtualbox}
   bash {toxinidir}/tests/scripts/generate_ssh_config.sh {changedir}
 
-  ansible-playbook -vv -i {changedir}/hosts {toxinidir}/{env:PLAYBOOK:site.yml.sample} \
-      --extra-vars="fetch_directory={changedir}/fetch ceph_rhcs={env:USE_CEPH_RHCS:false} ceph_origin={env:CEPH_ORIGIN:upstream} ceph_dev={env:CEPH_DEV:false} ceph_dev_branch={env:CEPH_DEV_BRANCH:master} ceph_dev_sha1={env:CEPH_DEV_SHA1:latest} ceph_stable_release={env:CEPH_STABLE_RELEASE:jewel}"
+  ansible-playbook -vv -i {changedir}/hosts {toxinidir}/{env:PLAYBOOK:site.yml.sample} --extra-vars="\
+      fetch_directory={changedir}/fetch \
+      ceph_rhcs={env:USE_CEPH_RHCS:false} \
+      ceph_origin={env:CEPH_ORIGIN:upstream} \
+      ceph_dev={env:CEPH_DEV:false} \
+      ceph_dev_branch={env:CEPH_DEV_BRANCH:master} \
+      ceph_dev_sha1={env:CEPH_DEV_SHA1:latest} \
+      ceph_stable_release={env:CEPH_STABLE_RELEASE:jewel}"
   ansible-playbook -vv -i {changedir}/hosts {toxinidir}/tests/functional/setup.yml
 
   testinfra -n 4 --sudo -v --connection=ansible --ansible-inventory={changedir}/hosts {toxinidir}/tests/functional/tests