From 8c8e4beda733648946140a5a14d23a346d3b5292 Mon Sep 17 00:00:00 2001 From: Jesse Pretorius Date: Thu, 8 Mar 2018 08:32:58 +0000 Subject: [PATCH] Unpin ceph-ansible and add ceph-ansible library path 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 exists within ceph-ansible that we should also import. Depends-On: https://review.openstack.org/550747 Depends-On: https://review.openstack.org/578736 Change-Id: Ic70d0e9eb57be9a9a1d8a658ceacc50c47ab9c02 Co-Authored-By: Jean-Philippe Evrard --- ansible-role-requirements.yml | 2 +- scripts/openstack-ansible.rc | 6 +++--- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/ansible-role-requirements.yml b/ansible-role-requirements.yml index 378e3101e6..a2226fa3d1 100644 --- a/ansible-role-requirements.yml +++ b/ansible-role-requirements.yml @@ -189,7 +189,7 @@ - name: ceph-ansible scm: git src: https://github.com/ceph/ceph-ansible - version: 78c1f1938f9365809cc5e7d09cb77566c7045e3b + version: master - name: opendaylight scm: git src: https://github.com/opendaylight/integration-packaging-ansible-opendaylight diff --git a/scripts/openstack-ansible.rc b/scripts/openstack-ansible.rc index 7e31b5f912..f9e60fc909 100644 --- a/scripts/openstack-ansible.rc +++ b/scripts/openstack-ansible.rc @@ -21,11 +21,11 @@ mkdir -p "$(dirname ${ANSIBLE_LOG_PATH})" || unset ANSIBLE_LOG_PATH export ANSIBLE_ROLES_PATH="${ANSIBLE_ROLES_PATH:-/etc/ansible/roles:OSA_PLAYBOOK_PATH/roles:/etc/ansible/roles/ceph-ansible/roles}" -export ANSIBLE_LIBRARY="${ANSIBLE_LIBRARY:-/etc/ansible/roles/plugins/library}" +export ANSIBLE_LIBRARY="${ANSIBLE_LIBRARY:-/etc/ansible/roles/plugins/library:/etc/ansible/roles/ceph-ansible/library}" export ANSIBLE_LOOKUP_PLUGINS="${ANSIBLE_LOOKUP_PLUGINS:-/etc/ansible/roles/plugins/lookup}" export ANSIBLE_FILTER_PLUGINS="${ANSIBLE_FILTER_PLUGINS:-/etc/ansible/roles/plugins/filter}" -export ANSIBLE_ACTION_PLUGINS="${ANSIBLE_ACTION_PLUGINS:-/etc/ansible/roles/plugins/action}" -export ANSIBLE_CALLBACK_PLUGINS="${ANSIBLE_CALLBACK_PLUGINS:-/etc/ansible/roles/plugins/callback}" +export ANSIBLE_ACTION_PLUGINS="${ANSIBLE_ACTION_PLUGINS:-/etc/ansible/roles/plugins/action:/etc/ansible/roles/ceph-ansible/plugins/actions}" +export ANSIBLE_CALLBACK_PLUGINS="${ANSIBLE_CALLBACK_PLUGINS:-/etc/ansible/roles/plugins/callback:/etc/ansible/roles/ceph-ansible/plugins/callback}" export ANSIBLE_TEST_PLUGINS="${ANSIBLE_TEST_PLUGINS:-/etc/ansible/roles/plugins/test}" export ANSIBLE_VARS_PLUGINS="${ANSIBLE_VARS_PLUGINS:-/etc/ansible/roles/plugins/vars_plugins}"