Merge "Update plugin folder names"

playbooks/ansible.cfg

@@ -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

releasenotes/notes/plugin-folder-rename-359378939fda5ce1.yaml

@@ -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``.

scripts/gate-check-commit.sh

@@ -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

tests/ansible.cfg

@@ -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