Merge pull request #1385 from ceph/fetch-dir

tests: allow setting fetch_directory with an environment variable
pull/1391/head
Alfredo Deza 2017-03-21 13:34:42 -04:00 committed by GitHub
commit 2b3a1ea8e9
1 changed files with 4 additions and 4 deletions

View File

@ -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},\