openstack/kayobe
Code Issues Proposed changes

Merge "Fix merge action plugins verbose output"

Browse Source
This commit is contained in:
Zuul 2023-04-14 07:28:04 +00:00 committed by Gerrit Code Review
commit 51a9019c6b
2 changed files with 12 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
kayobe/plugins/action/merge_configs.py
View File

@ -175,12 +175,12 @@ class ActionModule(action.ActionBase):
del tmp # not used del tmp # not used
sources = self._task.args.get('sources', None) sources = self._task.args.get('sources', None)
whitespace = self._task.args.get('whitespace', True)
if not isinstance(sources, list): if not isinstance(sources, list):
sources = [sources] sources = [sources]
config = OverrideConfigParser( config = OverrideConfigParser(whitespace=whitespace)
whitespace=self._task.args.get('whitespace', True))
for source in sources: for source in sources:
self.read_config(source, config) self.read_config(source, config)
@ -217,7 +217,11 @@ class ActionModule(action.ActionBase):
loader=self._loader, loader=self._loader,
templar=self._templar, templar=self._templar,
shared_loader_obj=self._shared_loader_obj) 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: finally:
shutil.rmtree(local_tempdir) shutil.rmtree(local_tempdir)
return result return result

6
kayobe/plugins/action/merge_yaml.py
View File

@ -150,7 +150,11 @@ class ActionModule(action.ActionBase):
loader=self._loader, loader=self._loader,
templar=self._templar, templar=self._templar,
shared_loader_obj=self._shared_loader_obj) 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: finally:
shutil.rmtree(local_tempdir) shutil.rmtree(local_tempdir)
return result return result