From 0ee07525ed2b9bd07024487ef78c1fae2a432a69 Mon Sep 17 00:00:00 2001 From: Jesse Pretorius Date: Mon, 11 Feb 2019 17:31:40 +0000 Subject: [PATCH] Use the config_template module from the dedicated repo The config_template action module has now been moved into its own git repository (openstack/ansible-config_template). This has been done to simplify the ability to use the plugin in other non OpenStack-Ansible projects. This implements the changes necessary to ensure that all integrated build tests now make use of the new git repository, rather than the old location in the openstack-ansible-plugins repository. The config_template repo is placed first in the list of library/action plugin locations to use to ensure that any other version of the plugin (eg: ceph) is not used. Related-Bug: 1791258 Depends-On: https://review.openstack.org/635838 Change-Id: I22fd0ef19b32ff8d949effcfe7fd7f4a653d8e08 --- ansible-role-requirements.yml | 4 ++++ scripts/openstack-ansible.rc | 4 ++-- 2 files changed, 6 insertions(+), 2 deletions(-) diff --git a/ansible-role-requirements.yml b/ansible-role-requirements.yml index 5bb8559bb6..c1229c78b4 100644 --- a/ansible-role-requirements.yml +++ b/ansible-role-requirements.yml @@ -6,6 +6,10 @@ scm: git src: https://git.openstack.org/openstack/openstack-ansible-apt_package_pinning version: master +- name: config_template + scm: git + src: https://git.openstack.org/openstack/ansible-config_template + version: master - name: pip_install scm: git src: https://git.openstack.org/openstack/openstack-ansible-pip_install diff --git a/scripts/openstack-ansible.rc b/scripts/openstack-ansible.rc index 3324c8148e..2450233c7c 100644 --- a/scripts/openstack-ansible.rc +++ b/scripts/openstack-ansible.rc @@ -21,10 +21,10 @@ 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:/etc/ansible/roles/ceph-ansible/library}" +export ANSIBLE_LIBRARY="${ANSIBLE_LIBRARY:-/etc/ansible/roles/config_template/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:/etc/ansible/roles/ceph-ansible/plugins/actions}" +export ANSIBLE_ACTION_PLUGINS="${ANSIBLE_ACTION_PLUGINS:-/etc/ansible/roles/config_template/action:/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}"