cmueller/ansible
1
0
Fork 0
Code Issues Pull requests Projects Releases Wiki Activity

fixes incorrect module name for action plugin (#19535)

Browse source 
This fixes a bug introduced in the action plugin for setting the
module name value for logging
This commit is contained in:
Peter Sprygada 2016-12-19 16:54:31 -05:00 committed by GitHub
parent 507b96ff30
commit c546c12b60
1 changed files with 3 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
lib/ansible/plugins/action/__init__.py
View file

@ -517,7 +517,7 @@ class ActionBase(with_metaclass(ABCMeta, object)):
data = re.sub(r'^((\r)?\n)?BECOME-SUCCESS.*(\r)?\n', '', data) data = re.sub(r'^((\r)?\n)?BECOME-SUCCESS.*(\r)?\n', '', data)
return data return data
def _update_module_args(self, module_args, task_vars): def _update_module_args(self, module_name, module_args, task_vars):
# set check mode in the module arguments, if required # set check mode in the module arguments, if required
if self._play_context.check_mode: if self._play_context.check_mode:
@ -543,7 +543,7 @@ class ActionBase(with_metaclass(ABCMeta, object)):
module_args['_ansible_version'] = __version__ module_args['_ansible_version'] = __version__
# give the module information about its name # give the module information about its name
module_args['_ansible_module_name'] = self._task.action module_args['_ansible_module_name'] = module_name
# set the syslog facility to be used in the module # set the syslog facility to be used in the module
module_args['_ansible_syslog_facility'] = task_vars.get('ansible_syslog_facility', C.DEFAULT_SYSLOG_FACILITY) module_args['_ansible_syslog_facility'] = task_vars.get('ansible_syslog_facility', C.DEFAULT_SYSLOG_FACILITY)
@ -568,7 +568,7 @@ class ActionBase(with_metaclass(ABCMeta, object)):
# Get the connection user for permission checks # Get the connection user for permission checks
remote_user = task_vars.get('ansible_ssh_user') or self._play_context.remote_user remote_user = task_vars.get('ansible_ssh_user') or self._play_context.remote_user
self._update_module_args(module_args, task_vars) self._update_module_args(module_name, module_args, task_vars)
(module_style, shebang, module_data, module_path) = self._configure_module(module_name=module_name, module_args=module_args, task_vars=task_vars) (module_style, shebang, module_data, module_path) = self._configure_module(module_name=module_name, module_args=module_args, task_vars=task_vars)
display.vvv("Using module file %s" % module_path) display.vvv("Using module file %s" % module_path)