From 3519281b44912d9c5accab475d4d4f4ed417b7b5 Mon Sep 17 00:00:00 2001 From: Guillaume Abrioux Date: Thu, 11 Apr 2019 17:18:02 +0200 Subject: [PATCH] tests: pass osd_scenario value to lvm_setup.yml we must pass the value of osd_scenario from the stable-3.2 branch which is used for the initial deployment. Signed-off-by: Guillaume Abrioux --- tox-update.ini | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/tox-update.ini b/tox-update.ini index b2f9adf12..36562d93c 100644 --- a/tox-update.ini +++ b/tox-update.ini @@ -49,17 +49,17 @@ commands= vagrant up --no-provision {posargs:--provider=virtualbox} bash {toxinidir}/tests/scripts/generate_ssh_config.sh {changedir} - # use the stable-3.2 branch to deploy a luminous cluster - git clone -b {env:CEPH_ANSIBLE_BRANCH:stable-3.2} --single-branch https://github.com/ceph/ceph-ansible.git {envdir}/tmp/ceph-ansible + # use the stable-3.2 branch to deploy a mimic cluster + git clone -b stable-3.2 --single-branch https://github.com/ceph/ceph-ansible.git {envdir}/tmp/ceph-ansible pip install -r {envdir}/tmp/ceph-ansible/tests/requirements.txt ansible-playbook -vv -i {changedir}/{env:INVENTORY} {envdir}/tmp/ceph-ansible/tests/functional/setup.yml # configure lvm - ansible-playbook -vv -i {changedir}/{env:INVENTORY} {envdir}/tmp/ceph-ansible/tests/functional/lvm_setup.yml + ansible-playbook -vv -i {changedir}/{env:INVENTORY} {envdir}/tmp/ceph-ansible/tests/functional/lvm_setup.yml --extra-vars "osd_scenario=lvm" - # deploy the cluster - ansible-playbook -vv -i {changedir}/hosts {envdir}/tmp/ceph-ansible/{env:PLAYBOOK:site.yml.sample} --extra-vars "\ + # deploy the cluster + ansible-playbook -vv -i {envdir}/tmp/ceph-ansible/tests/functional/all_daemons{env:CONTAINER_DIR:}/{env:INVENTORY} {envdir}/tmp/ceph-ansible/{env:PLAYBOOK:site.yml.sample} --extra-vars "\ delegate_facts_host={env:DELEGATE_FACTS_HOST:True} \ fetch_directory={env:FETCH_DIRECTORY:{changedir}/fetch} \ ceph_stable_release={env:CEPH_STABLE_RELEASE:mimic} \