From: Andrew Schoen <aschoen@redhat.com>
Date: Mon, 20 Mar 2017 21:22:07 +0000 (-0500)
Subject: tests: allow setting fetch_directory with an environment variable
X-Git-Tag: v2.2.0~22^2
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=2967023ea92e4d43ca86cd7dc24700e7f73e06fd;p=ceph-ansible.git

tests: allow setting fetch_directory with an environment variable

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

diff --git a/tox.ini b/tox.ini
index 4d9186a50..40cf2db06 100644
--- a/tox.ini
+++ b/tox.ini
@@ -11,7 +11,7 @@ commands=
   cp {toxinidir}/infrastructure-playbooks/purge-cluster.yml {toxinidir}/purge-cluster.yml
   ansible-playbook -vv -i {changedir}/hosts {toxinidir}/purge-cluster.yml -e ireallymeanit=yes --extra-vars '\
     \{\
-     "fetch_directory":"{changedir}/fetch",\
+     "fetch_directory":"{env:FETCH_DIRECTORY:{changedir}/fetch}",\
      "ceph_rhcs":{env:CEPH_RHCS:false},\
      "ceph_origin":"{env:CEPH_ORIGIN:upstream}",\
      "ceph_dev":{env:CEPH_DEV:false},\
@@ -23,7 +23,7 @@ commands=
   # set up the cluster again
   ansible-playbook -vv -i {changedir}/hosts {toxinidir}/site.yml.sample --extra-vars '\
     \{\
-     "fetch_directory":"{changedir}/fetch",\
+     "fetch_directory":"{env:FETCH_DIRECTORY:{changedir}/fetch}",\
      "ceph_rhcs":{env:CEPH_RHCS:false},\
      "ceph_origin":"{env:CEPH_ORIGIN:upstream}",\
      "ceph_dev":{env:CEPH_DEV:false},\
@@ -43,7 +43,7 @@ commands=
   cp {toxinidir}/infrastructure-playbooks/rolling_update.yml {toxinidir}/rolling_update.yml
   ansible-playbook -vv -i {changedir}/hosts {toxinidir}/rolling_update.yml -e ireallymeanit=yes --extra-vars '\
     \{\
-      "fetch_directory":"{changedir}/fetch",\
+      "fetch_directory":"{env:FETCH_DIRECTORY:{changedir}/fetch}",\
       "ceph_rhcs":{env:CEPH_RHCS:false},\
       "ceph_origin":"{env:CEPH_ORIGIN:upstream}",\
       "ceph_dev":{env:CEPH_DEV:false},\
@@ -100,7 +100,7 @@ commands=
 
   ansible-playbook -vv -i {changedir}/hosts {toxinidir}/{env:PLAYBOOK:site.yml.sample} --extra-vars '\
     \{\
-     "fetch_directory":"{changedir}/fetch",\
+     "fetch_directory":"{env:FETCH_DIRECTORY:{changedir}/fetch}",\
      "ceph_rhcs":{env:CEPH_RHCS:false},\
      "ceph_origin":"{env:CEPH_ORIGIN:upstream}",\
      "ceph_dev":{env:CEPH_DEV:false},\