]> git.apps.os.sepia.ceph.com Git - ceph-ansible.git/commitdiff
tests: apply dev_setup on the secondary cluster for rgw_multisite
authorGuillaume Abrioux <gabrioux@redhat.com>
Tue, 27 Nov 2018 09:26:41 +0000 (10:26 +0100)
committermergify[bot] <mergify[bot]@users.noreply.github.com>
Wed, 28 Nov 2018 12:56:57 +0000 (12:56 +0000)
we must apply this playbook before deploying the secondary cluster.
Otherwise, there will be a mismatch between the two deployed cluster.

Signed-off-by: Guillaume Abrioux <gabrioux@redhat.com>
(cherry picked from commit 3d8f4e63045d9453549e86fc280556663a9a9a1c)

tox.ini

diff --git a/tox.ini b/tox.ini
index 2a265392054e935e0311cc3e6da4231604a0189d..5de1697d6b350ad36092527d34b751f07c70bb3b 100644 (file)
--- a/tox.ini
+++ b/tox.ini
@@ -165,6 +165,7 @@ commands=
   bash -c "cd {changedir}/secondary && vagrant up --no-provision {posargs:--provider=virtualbox}"
   bash -c "cd {changedir}/secondary && bash {toxinidir}/tests/scripts/generate_ssh_config.sh {changedir}/secondary"
   ansible-playbook --ssh-extra-args='-F {changedir}/secondary/vagrant_ssh_config' -vv -i {changedir}/secondary/hosts {toxinidir}/tests/functional/setup.yml
+  ansible-playbook -vv -i "localhost," -c local {toxinidir}/tests/functional/dev_setup.yml --extra-vars "change_dir={changedir}/secondary ceph_dev_branch={env:CEPH_DEV_BRANCH:master} ceph_dev_sha1={env:CEPH_DEV_SHA1:latest}" --tags "vagrant_setup"
   ansible-playbook --ssh-extra-args='-F {changedir}/secondary/vagrant_ssh_config' -vv -i {changedir}/secondary/hosts {toxinidir}/{env:PLAYBOOK:site.yml.sample} --extra-vars "\
       ireallymeanit=yes \
       fetch_directory={env:FETCH_DIRECTORY:{changedir}/secondary/fetch} \