From 0f89a3f7a5924802d32d57bd8a4510a025f5b07e Mon Sep 17 00:00:00 2001 From: Dimitri Savineau Date: Tue, 23 Apr 2019 10:40:09 -0400 Subject: [PATCH] tox: Don't copy infrastructure playbook Since a1a871c we don't need to copy the infrastructure playbooks under the ceph-ansible root directory. Signed-off-by: Dimitri Savineau --- tox-update.ini | 4 +--- tox.ini | 36 +++++++++++------------------------- 2 files changed, 12 insertions(+), 28 deletions(-) diff --git a/tox-update.ini b/tox-update.ini index 36562d93c..030db95fb 100644 --- a/tox-update.ini +++ b/tox-update.ini @@ -7,7 +7,6 @@ skipsdist = True whitelist_externals = vagrant bash - cp git pip passenv=* @@ -70,9 +69,8 @@ commands= " pip install -r {toxinidir}/tests/requirements.txt - cp {toxinidir}/infrastructure-playbooks/rolling_update.yml {toxinidir}/rolling_update.yml non_container: ansible-playbook -vv -i "localhost," -c local {toxinidir}/tests/functional/dev_setup.yml --extra-vars "dev_setup=True change_dir={changedir} ceph_dev_branch={env:UPDATE_CEPH_DEV_BRANCH:master} ceph_dev_sha1={env:UPDATE_CEPH_DEV_SHA1:latest}" --tags "vagrant_setup" - ansible-playbook -vv -i {changedir}/{env:INVENTORY} {toxinidir}/rolling_update.yml --extra-vars "\ + ansible-playbook -vv -i {changedir}/{env:INVENTORY} {toxinidir}/infrastructure-playbooks/rolling_update.yml --extra-vars "\ ireallymeanit=yes \ fetch_directory={env:FETCH_DIRECTORY:{changedir}/fetch} \ ceph_docker_registry={env:CEPH_DOCKER_REGISTRY:docker.io} \ diff --git a/tox.ini b/tox.ini index 31f2a0b82..d2ab7018f 100644 --- a/tox.ini +++ b/tox.ini @@ -14,7 +14,6 @@ skipsdist = True whitelist_externals = vagrant bash - cp git pip passenv=* @@ -58,8 +57,7 @@ commands= pip install -r {toxinidir}/tests/requirements.txt # migrate osds to ceph-volume and upgrade to nautilus - cp {toxinidir}/infrastructure-playbooks/rolling_update.yml {toxinidir}/rolling_update.yml - ansible-playbook -vv -i {changedir}/hosts {toxinidir}/rolling_update.yml --extra-vars "\ + ansible-playbook -vv -i {changedir}/hosts {toxinidir}/infrastructure-playbooks/rolling_update.yml --extra-vars "\ ireallymeanit=yes \ fetch_directory={env:FETCH_DIRECTORY:{changedir}/fetch} \ ceph_docker_registry={env:CEPH_DOCKER_REGISTRY:docker.io} \ @@ -85,7 +83,6 @@ commands= whitelist_externals = vagrant bash - cp mkdir cat passenv=* @@ -103,11 +100,9 @@ commands= vagrant up --no-provision {posargs:--provider=virtualbox} bash {toxinidir}/tests/scripts/generate_ssh_config.sh {changedir} - cp {toxinidir}/infrastructure-playbooks/lv-create.yml {toxinidir}/lv-create.yml - ansible-playbook -vv -i {changedir}/hosts {toxinidir}/lv-create.yml + ansible-playbook -vv -i {changedir}/hosts {toxinidir}/infrastructure-playbooks/lv-create.yml - cp {toxinidir}/infrastructure-playbooks/lv-teardown.yml {toxinidir}/lv-teardown.yml - ansible-playbook -vv -i {changedir}/hosts {toxinidir}/lv-teardown.yml --extra-vars "ireallymeanit=yes" + ansible-playbook -vv -i {changedir}/hosts {toxinidir}/infrastructure-playbooks/lv-teardown.yml --extra-vars "ireallymeanit=yes" cat {toxinidir}/lv-create.log @@ -119,8 +114,7 @@ commands= # can be redployed to. [purge] commands= - cp {toxinidir}/infrastructure-playbooks/{env:PURGE_PLAYBOOK:purge-cluster.yml} {toxinidir}/{env:PURGE_PLAYBOOK:purge-cluster.yml} - ansible-playbook -vv -i {changedir}/{env:INVENTORY} {toxinidir}/{env:PURGE_PLAYBOOK:purge-cluster.yml} --extra-vars "\ + ansible-playbook -vv -i {changedir}/{env:INVENTORY} {toxinidir}/infrastructure-playbooks/{env:PURGE_PLAYBOOK:purge-cluster.yml} --extra-vars "\ ireallymeanit=yes \ remove_packages=yes \ ceph_stable_release={env:CEPH_STABLE_RELEASE:nautilus} \ @@ -148,8 +142,7 @@ commands= [purge-lvm] commands= - cp {toxinidir}/infrastructure-playbooks/{env:PURGE_PLAYBOOK:purge-cluster.yml} {toxinidir}/{env:PURGE_PLAYBOOK:purge-cluster.yml} - ansible-playbook -vv -i {changedir}/{env:INVENTORY} {toxinidir}/{env:PURGE_PLAYBOOK:purge-cluster.yml} --extra-vars "\ + ansible-playbook -vv -i {changedir}/{env:INVENTORY} {toxinidir}/infrastructure-playbooks/{env:PURGE_PLAYBOOK:purge-cluster.yml} --extra-vars "\ ireallymeanit=yes \ remove_packages=yes \ ceph_stable_release={env:CEPH_STABLE_RELEASE:nautilus} \ @@ -176,16 +169,14 @@ commands= [shrink-mon] commands= - cp {toxinidir}/infrastructure-playbooks/shrink-mon.yml {toxinidir}/shrink-mon.yml - ansible-playbook -vv -i {changedir}/{env:INVENTORY} {toxinidir}/shrink-mon.yml --extra-vars "\ + ansible-playbook -vv -i {changedir}/{env:INVENTORY} {toxinidir}/infrastructure-playbooks/shrink-mon.yml --extra-vars "\ ireallymeanit=yes \ mon_to_kill={env:MON_TO_KILL:mon2} \ ceph_docker_image_tag={env:CEPH_DOCKER_IMAGE_TAG:latest-master} \ " [shrink-osd] commands= - cp {toxinidir}/infrastructure-playbooks/shrink-osd.yml {toxinidir}/shrink-osd.yml - ansible-playbook -vv -i {changedir}/{env:INVENTORY} {toxinidir}/shrink-osd.yml --extra-vars "\ + ansible-playbook -vv -i {changedir}/{env:INVENTORY} {toxinidir}/infrastructure-playbooks/shrink-osd.yml --extra-vars "\ ireallymeanit=yes \ osd_to_kill=0 \ ceph_docker_registry={env:CEPH_DOCKER_REGISTRY:docker.io} \ @@ -195,8 +186,7 @@ commands= [switch-to-containers] commands= - cp {toxinidir}/infrastructure-playbooks/switch-from-non-containerized-to-containerized-ceph-daemons.yml {toxinidir}/switch-from-non-containerized-to-containerized-ceph-daemons.yml - ansible-playbook -vv -i {changedir}/{env:INVENTORY} {toxinidir}/switch-from-non-containerized-to-containerized-ceph-daemons.yml --extra-vars "\ + ansible-playbook -vv -i {changedir}/{env:INVENTORY} {toxinidir}/infrastructure-playbooks/switch-from-non-containerized-to-containerized-ceph-daemons.yml --extra-vars "\ ireallymeanit=yes \ fetch_directory={env:FETCH_DIRECTORY:{changedir}/fetch} \ ceph_docker_registry={env:CEPH_DOCKER_REGISTRY:docker.io} \ @@ -211,8 +201,7 @@ commands= [add-mons] commands= ansible-playbook -vv -i {changedir}/hosts-2 --limit mon1 {toxinidir}/tests/functional/setup.yml - cp {toxinidir}/infrastructure-playbooks/add-mon.yml {toxinidir}/add-mon.yml - ansible-playbook -vv -i {changedir}/hosts-2 {toxinidir}/add-mon.yml --extra-vars "\ + ansible-playbook -vv -i {changedir}/hosts-2 {toxinidir}/infrastructure-playbooks/add-mon.yml --extra-vars "\ ireallymeanit=yes \ fetch_directory={env:FETCH_DIRECTORY:{changedir}/fetch} \ ceph_stable_release={env:CEPH_STABLE_RELEASE:nautilus} \ @@ -228,8 +217,7 @@ commands= commands= ansible-playbook -vv -i {changedir}/hosts-2 --limit osd1 {toxinidir}/tests/functional/setup.yml ansible-playbook -vv -i {changedir}/hosts-2 --limit osd1 {toxinidir}/tests/functional/lvm_setup.yml - cp {toxinidir}/infrastructure-playbooks/add-osd.yml {toxinidir}/add-osd.yml - ansible-playbook -vv -i {changedir}/hosts-2 --limit osd1 {toxinidir}/add-osd.yml --extra-vars "\ + ansible-playbook -vv -i {changedir}/hosts-2 --limit osd1 {toxinidir}/infrastructure-playbooks/add-osd.yml --extra-vars "\ ireallymeanit=yes \ fetch_directory={env:FETCH_DIRECTORY:{changedir}/fetch} \ ceph_stable_release={env:CEPH_STABLE_RELEASE:nautilus} \ @@ -329,8 +317,7 @@ commands= [storage-inventory] commands= - cp {toxinidir}/infrastructure-playbooks/storage-inventory.yml {toxinidir}/storage-inventory.yml - ansible-playbook -vv -i {changedir}/hosts {toxinidir}/storage-inventory.yml --extra-vars "\ + ansible-playbook -vv -i {changedir}/hosts {toxinidir}/infrastructure-playbooks/storage-inventory.yml --extra-vars "\ ceph_docker_image_tag={env:CEPH_DOCKER_IMAGE_TAG:latest-master} \ " @@ -339,7 +326,6 @@ whitelist_externals = vagrant bash pip - cp sleep rm passenv=*