openstack/openstack-ansible
Code Issues Proposed changes

Update plugin folder names

Browse Source 
The standard Ansible names for the plugins folders [1] are singular.

This patch implements the renaming of all the places where ansible.cfg
has the plural names to match the change in the plugins repo.

[1] https://github.com/ansible/ansible/blob/devel/lib/ansible/constants.py

Change-Id: Ibb80cdb99ff254df79da03b7d916509f6d4f8bad
Depends-On: Ib965750f267d11287a6196e2544c3a014a3e2029
This commit is contained in:
Jesse Pretorius 2016-02-10 01:02:51 +00:00
parent 04b80d6ec7
commit 89d46b2ebc
4 changed files with 16 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
playbooks/ansible.cfg
View File

@ -1,8 +1,8 @@
[defaults]
# Additional plugins
lookup_plugins = /etc/ansible/plugins/lookups
filter_plugins = /etc/ansible/plugins/filters
action_plugins = /etc/ansible/plugins/actions
lookup_plugins = /etc/ansible/plugins/lookup
filter_plugins = /etc/ansible/plugins/filter
action_plugins = /etc/ansible/plugins/action
library = /etc/ansible/plugins/library
# Fact caching

7
releasenotes/notes/plugin-folder-rename-359378939fda5ce1.yaml Normal file
View File

@ -0,0 +1,7 @@
---
upgrade:
- The plugins folders have been renamed to the default names used
in Ansible 2.x. This is part of the preparation for Ansible 2.x
readiness. The renames are specifically ``actions > action``,
``callbacks > callback``, ``filters > filter``,
``lookups > lookup``.

4
scripts/gate-check-commit.sh
View File

@ -125,10 +125,10 @@ pushd $(dirname ${0})/../playbooks
sed -i '/\[defaults\]/a log_path = /openstack/log/ansible-logging/ansible.log' ansible.cfg
# This plugin makes the output easier to read
wget -O /etc/ansible/plugins/callbacks/human_log.py https://gist.githubusercontent.com/cliffano/9868180/raw/f360f306b3c6d689734a6aa8773a00edf16a0054/human_log.py
wget -O /etc/ansible/plugins/callback/human_log.py https://gist.githubusercontent.com/cliffano/9868180/raw/f360f306b3c6d689734a6aa8773a00edf16a0054/human_log.py
# Enable callback plugins
sed -i '/\[defaults\]/a callback_plugins = /etc/ansible/plugins/callbacks' ansible.cfg
sed -i '/\[defaults\]/a callback_plugins = /etc/ansible/plugins/callback' ansible.cfg
popd
# Log some data about the instance and the rest of the system

7
tests/ansible.cfg
View File

@ -1,8 +1,9 @@
[defaults]
# Additional plugins
lookup_plugins = /etc/ansible/plugins/lookups
filter_plugins = /etc/ansible/plugins/filters
action_plugins = /etc/ansible/plugins/actions
action_plugins = /etc/ansible/plugins/action
callback_plugins = /etc/ansible/plugins/callback
filter_plugins = /etc/ansible/plugins/filter
lookup_plugins = /etc/ansible/plugins/lookup
library = /etc/ansible/plugins/library
# Set color options