diff --git a/kayobe/plugins/action/merge_configs.py b/kayobe/plugins/action/merge_configs.py index ce45bf763..3aff18d53 100644 --- a/kayobe/plugins/action/merge_configs.py +++ b/kayobe/plugins/action/merge_configs.py @@ -175,12 +175,12 @@ class ActionModule(action.ActionBase): del tmp # not used sources = self._task.args.get('sources', None) + whitespace = self._task.args.get('whitespace', True) if not isinstance(sources, list): sources = [sources] - config = OverrideConfigParser( - whitespace=self._task.args.get('whitespace', True)) + config = OverrideConfigParser(whitespace=whitespace) for source in sources: self.read_config(source, config) @@ -217,7 +217,11 @@ class ActionModule(action.ActionBase): loader=self._loader, templar=self._templar, shared_loader_obj=self._shared_loader_obj) - result.update(copy_action.run(task_vars=task_vars)) + copy_result = copy_action.run(task_vars=task_vars) + copy_result['invocation']['module_args'].update({ + 'src': result_file, 'sources': sources, + 'whitespace': whitespace}) + result.update(copy_result) finally: shutil.rmtree(local_tempdir) return result diff --git a/kayobe/plugins/action/merge_yaml.py b/kayobe/plugins/action/merge_yaml.py index 943ca0158..0655478c5 100644 --- a/kayobe/plugins/action/merge_yaml.py +++ b/kayobe/plugins/action/merge_yaml.py @@ -150,7 +150,11 @@ class ActionModule(action.ActionBase): loader=self._loader, templar=self._templar, shared_loader_obj=self._shared_loader_obj) - result.update(copy_action.run(task_vars=task_vars)) + copy_result = copy_action.run(task_vars=task_vars) + copy_result['invocation']['module_args'].update({ + 'src': result_file, 'sources': sources, + 'extend_lists': extend_lists}) + result.update(copy_result) finally: shutil.rmtree(local_tempdir) return result