tests: define the env var for VAGRANT_PROVIDER defaulting to libvirt

Signed-off-by: Alfredo Deza <adeza@redhat.com>
ceph · Jan 12, 2017 · 06f2183 · 06f2183
1 parent 1fb5f5a
commit 06f2183
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 2 deletions.
diff --git a/tests/tox.sh b/tests/tox.sh
@@ -46,7 +46,7 @@ bash $TOXINIDIR/ceph-ansible/tests/scripts/generate_ssh_config.sh $CEPH_ANSIBLE_
 
 export ANSIBLE_SSH_ARGS="-F $CEPH_ANSIBLE_SCENARIO_PATH/vagrant_ssh_config"
 
-ansible-playbook -vv -i $CEPH_ANSIBLE_SCENARIO_PATH/hosts $TOXINIDIR/ceph-ansible/site-docker.yml.sample --extra-vars="fetch_directory=$CEPH_ANSIBLE_SCENARIO_PATH/fetch"
+ansible-playbook -vv -i $CEPH_ANSIBLE_SCENARIO_PATH/hosts $TOXINIDIR/ceph-ansible/site-docker.yml.sample --extra-vars="ceph_docker_dev_image=true fetch_directory=$CEPH_ANSIBLE_SCENARIO_PATH/fetch"
 
 ansible-playbook -vv -i $CEPH_ANSIBLE_SCENARIO_PATH/hosts $TOXINIDIR/ceph-ansible/tests/functional/setup.yml
 

diff --git a/tox.ini b/tox.ini
@@ -18,7 +18,7 @@ setenv=
   centos7_cluster: CEPH_ANSIBLE_SCENARIO_PATH = {toxinidir}/ceph-ansible/tests/functional/centos/7/docker-cluster
   xenial_cluster: CEPH_ANSIBLE_SCENARIO_PATH = {toxinidir}/ceph-ansible/tests/functional/ubuntu/xenial/docker-cluster
   ceph_ansible2.1: CEPH_ANSIBLE_BRANCH = stable-2.1
-
+  VAGRANT_PROVIDER={env:VAGRANT_PROVIDER:libvirt}
 deps=
   ansible==2.2
 commands=