]> git.apps.os.sepia.ceph.com Git - ceph-ansible.git/commitdiff
tests: add docker environment variables to tox.ini 1417/head
authorAndrew Schoen <aschoen@redhat.com>
Thu, 6 Apr 2017 15:29:16 +0000 (10:29 -0500)
committerAndrew Schoen <aschoen@redhat.com>
Thu, 6 Apr 2017 15:29:16 +0000 (10:29 -0500)
This allows us to control the docker registry, image name and tag name
for the containers.

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

diff --git a/tox.ini b/tox.ini
index bd0a037b3925d593d255aa2ee1874efb7c4e624f..7ac24e1f7608a5a23ae1c752e6d2d1eabb210573 100644 (file)
--- a/tox.ini
+++ b/tox.ini
@@ -118,7 +118,10 @@ commands=
      "ceph_dev_branch":"{env:CEPH_DEV_BRANCH:master}",\
      "ceph_dev_sha1":"{env:CEPH_DEV_SHA1:latest}",\
      "ceph_stable_release":"{env:CEPH_STABLE_RELEASE:jewel}",\
-     "ceph_stable":{env:CEPH_STABLE:true}\
+     "ceph_stable":{env:CEPH_STABLE:true},\
+     "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}"\
     \}'
 
   ansible-playbook -vv -i {changedir}/hosts {toxinidir}/tests/functional/setup.yml