openstack/openstack-ansible-tests
Code Issues Proposed changes

Add ceph-ansible library and callback path

Browse Source 
The ceph-ansible project has created a new library which
is held in the root folder. We need to ensure that the
library path is included.

Additionally a callback plugins directory inside plugins/callback has
been added, along with an action plugins directory inside
plugins/actions.

Finally, the sed command we use to replace the default roles directory
was causing issues in that it applied to any lines that were not
necessarily the roles_path. This PR adjusts the sed to ensure it is only
the roles_path line that is replaced.

Change-Id: I0d30d749ef2e00c1d199e53a837462619a9b2650
This commit is contained in:
Jesse Pretorius 2018-03-08 08:30:31 +00:00 committed by Andy McCrae
parent 6206b81219
commit 0943a630bb
2 changed files with 4 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -227,7 +227,7 @@ fi
# role paths if any are provided and they're not already set. # role paths if any are provided and they're not already set.
if [ ! -z "${ANSIBLE_EXTRA_ROLE_DIRS}" ]; then if [ ! -z "${ANSIBLE_EXTRA_ROLE_DIRS}" ]; then
if ! grep -q "roles_path.*${ANSIBLE_EXTRA_ROLE_DIRS}" "${ANSIBLE_CFG_PATH}"; then if ! grep -q "roles_path.*${ANSIBLE_EXTRA_ROLE_DIRS}" "${ANSIBLE_CFG_PATH}"; then
sed -i "s|HOME/.ansible/roles.*|HOME/.ansible/roles:${ANSIBLE_ROLE_DIR}:${ANSIBLE_EXTRA_ROLE_DIRS}|" "${ANSIBLE_CFG_PATH}" sed -i "s|roles_path.*HOME/.ansible/roles.*|roles_path = $HOME/.ansible/roles:${ANSIBLE_ROLE_DIR}:${ANSIBLE_EXTRA_ROLE_DIRS}|" "${ANSIBLE_CFG_PATH}"
fi fi
fi fi

4
test-ansible.cfg
View File

@ -25,5 +25,7 @@ transport = ssh
host_key_checking = False host_key_checking = False
control_path = /tmp/%%h-%%r control_path = /tmp/%%h-%%r
ssh_args = -o ControlMaster=no -o UserKnownHostsFile=/dev/null -o StrictHostKeyChecking=no -o ServerAliveInterval=64 -o ServerAliveCountMax=1024 -o Compression=no -o TCPKeepAlive=yes -o VerifyHostKeyDNS=no -o ForwardX11=no -o ForwardAgent=yes ssh_args = -o ControlMaster=no -o UserKnownHostsFile=/dev/null -o StrictHostKeyChecking=no -o ServerAliveInterval=64 -o ServerAliveCountMax=1024 -o Compression=no -o TCPKeepAlive=yes -o VerifyHostKeyDNS=no -o ForwardX11=no -o ForwardAgent=yes
library = $HOME/.ansible/plugins/library library = $HOME/.ansible/plugins/library:$HOME/.ansible/roles/ceph-ansible/library
callback_plugins = $HOME/.ansible/plugins/callback:$HOME/.ansible/roles/ceph-ansible/plugins/callback
action_plugins = $HOME/.ansible/plugins/action:$HOME/.ansible/roles/ceph-ansible/plugins/actions
roles_path = $HOME/.ansible/roles:$HOME/.ansible/testing-role roles_path = $HOME/.ansible/roles:$HOME/.ansible/testing-role