From df5f9738df7f23f956c40ad5d987d03c50929b5e Mon Sep 17 00:00:00 2001 From: Logan V Date: Thu, 12 Jul 2018 09:57:38 -0500 Subject: [PATCH] Move get-ansible-role-requirements to scripts This playbook is the default clone method for roles in both testing and production. It originally started as a tests-only role fetcher, so it belonged in tests then, but now that it is used by default it should reside in scripts. Also remove an unnecessary reference to the test-inventory.ini, since the contents of test-inventory.ini are the contents of the default base ansible inventory if none is provided (meaning test-inventory.ini is generally redundant.) Change-Id: I47628f678098b283526e4fc6204520d85046a512 --- scripts/bootstrap-ansible.sh | 3 +-- {tests => scripts}/get-ansible-role-requirements.yml | 0 2 files changed, 1 insertion(+), 2 deletions(-) rename {tests => scripts}/get-ansible-role-requirements.yml (100%) diff --git a/scripts/bootstrap-ansible.sh b/scripts/bootstrap-ansible.sh index 17b8e68dc7..9bef290d86 100755 --- a/scripts/bootstrap-ansible.sh +++ b/scripts/bootstrap-ansible.sh @@ -209,9 +209,8 @@ if [ -f "${ANSIBLE_ROLE_FILE}" ]; then export ANSIBLE_STRATEGY_PLUGINS="/dev/null" export ANSIBLE_CONFIG="none-ansible.cfg" - pushd tests + pushd scripts /opt/ansible-runtime/bin/ansible-playbook get-ansible-role-requirements.yml \ - -i ${OSA_CLONE_DIR}/tests/test-inventory.ini \ -e role_file="${ANSIBLE_ROLE_FILE}" popd diff --git a/tests/get-ansible-role-requirements.yml b/scripts/get-ansible-role-requirements.yml similarity index 100% rename from tests/get-ansible-role-requirements.yml rename to scripts/get-ansible-role-requirements.yml