From fa821881472037291ec2225ddef327f98ca1f7db Mon Sep 17 00:00:00 2001 From: Matt Clay Date: Fri, 22 Mar 2019 15:02:47 -0700 Subject: [PATCH] Fix name and default for become plugin config. Also add version_added. --- lib/ansible/config/base.yml | 5 +++-- lib/ansible/plugins/loader.py | 2 +- 2 files changed, 4 insertions(+), 3 deletions(-) diff --git a/lib/ansible/config/base.yml b/lib/ansible/config/base.yml index 7041aec604..457ff60b4b 100644 --- a/lib/ansible/config/base.yml +++ b/lib/ansible/config/base.yml @@ -482,14 +482,15 @@ DEFAULT_BECOME_FLAGS: env: [{name: ANSIBLE_BECOME_FLAGS}] ini: - {key: become_flags, section: privilege_escalation} -DEFAULT_BECOME_PLUGIN_PATH: +BECOME_PLUGIN_PATH: name: Become plugins path - default: ~/.ansible/plugins/become:/usr/share/ansible/become + default: ~/.ansible/plugins/become:/usr/share/ansible/plugins/become description: Colon separated paths in which Ansible will search for Become Plugins. env: [{name: ANSIBLE_BECOME_PLUGINS}] ini: - {key: become_plugins, section: defaults} type: pathspec + version_added: "2.8" DEFAULT_BECOME_USER: # FIXME: should really be blank and make -u passing optional depending on it name: Set the user you 'become' via privilege escalation diff --git a/lib/ansible/plugins/loader.py b/lib/ansible/plugins/loader.py index d7746a50aa..9c9458f349 100644 --- a/lib/ansible/plugins/loader.py +++ b/lib/ansible/plugins/loader.py @@ -848,6 +848,6 @@ httpapi_loader = PluginLoader( become_loader = PluginLoader( 'BecomeModule', 'ansible.plugins.become', - C.DEFAULT_BECOME_PLUGIN_PATH, + C.BECOME_PLUGIN_PATH, 'become_plugins' )