From: Guillaume Abrioux <gabrioux@redhat.com>
Date: Thu, 11 Apr 2019 15:18:02 +0000 (+0200)
Subject: tests: pass osd_scenario value to lvm_setup.yml
X-Git-Tag: v4.0.0rc4~30
X-Git-Url: http://git.apps.os.sepia.ceph.com/?a=commitdiff_plain;h=90ab8ecaaafebdf483cccb2d167d00f2bf1beb05;p=ceph-ansible.git

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 <gabrioux@redhat.com>
(cherry picked from commit 3519281b44912d9c5accab475d4d4f4ed417b7b5)
---

diff --git a/tox-update.ini b/tox-update.ini
index 4310d099b..96ff7fe79 100644
--- a/tox-update.ini
+++ b/tox-update.ini
@@ -54,10 +54,10 @@ commands=
   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:luminous} \