openstack/openstack-ansible-tests
Code Issues Proposed changes

Merge "Update the location of the ARA callback" into stable/ocata

Browse Source
This commit is contained in:
Jenkins 2017-02-21 15:32:58 +00:00 committed by Gerrit Code Review
commit 525e6a01ef
1 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
test-ansible-env-prep.sh
View File

@ -96,11 +96,11 @@ else
fi
# Link the ARA Callback directory to the the ansible callback directory
if [ -d "${WORKING_DIR}/.tox/functional/lib/python2.7/site-packages/ara/callback/" ]; then
if [ -d "${WORKING_DIR}/.tox/functional/lib/python2.7/site-packages/ara/plugins/callbacks" ]; then
if [ ! -L "${ANSIBLE_PLUGIN_DIR}/callback/ara" ]; then
echo "Linking ${ANSIBLE_PLUGIN_DIR}/callback/ara to ${WORKING_DIR}/.tox/functional/lib/python2.7/site-packages/ara/callback/"
echo "Linking ${ANSIBLE_PLUGIN_DIR}/callback/ara to ${WORKING_DIR}/.tox/functional/lib/python2.7/site-packages/ara/plugins/callbacks/"
mkdir -p "${ANSIBLE_PLUGIN_DIR}/callback/ara"
ln -sf "${WORKING_DIR}/.tox/functional/lib/python2.7/site-packages/ara/callback/" "${ANSIBLE_PLUGIN_DIR}/callback/ara/"
ln -sf "${WORKING_DIR}/.tox/functional/lib/python2.7/site-packages/ara/plugins/callbacks" "${ANSIBLE_PLUGIN_DIR}/callback/ara/"
fi
fi