Workaround tripleo_nova_cache issue in ansible 2.9.11
99a37234b7
changes the core action plugin to assume task_vars has ansible_facts and ansible_delegated_vars keys when interpreter discovery is triggered. The tripleo_nova_cache action plugin passes custom task_vars dicts via self._exec_module that do not contain these keys. This looks like a regression in ansible. Workaround it for now while I take the issue upstream. Change-Id: I57dc24b8450f900ac1fb4e4c2f420f104618c609 (cherry picked from commitf38b4c97b9
) (cherry picked from commit65ce477988
)
This commit is contained in:
parent
73464f3c02
commit
0e09c0af2d
|
@ -79,7 +79,11 @@ class ActionModule(ActionBase):
|
|||
'creates': cache_dir
|
||||
|
||||
}
|
||||
command_task_vars = {'become': True}
|
||||
command_task_vars = {
|
||||
'become': True,
|
||||
'ansible_facts': task_vars.get('ansible_facts', {}),
|
||||
'ansible_delegated_vars': task_vars.get('ansible_delegated_vars', {})
|
||||
}
|
||||
command_result = self._execute_module(
|
||||
'command',
|
||||
module_args=command_args,
|
||||
|
@ -115,7 +119,11 @@ class ActionModule(ActionBase):
|
|||
"\"mkdir -p '{}'; chmod 755 '{}'\""
|
||||
).format(container_cli, cache_tmp, cache_tmp),
|
||||
}
|
||||
command_task_vars = {'become': True}
|
||||
command_task_vars = {
|
||||
'become': True,
|
||||
'ansible_facts': task_vars.get('ansible_facts', {}),
|
||||
'ansible_delegated_vars': task_vars.get('ansible_delegated_vars', {})
|
||||
}
|
||||
command_result = self._execute_module(
|
||||
'command',
|
||||
module_args=command_args,
|
||||
|
@ -133,7 +141,12 @@ class ActionModule(ActionBase):
|
|||
cache_tmp
|
||||
)
|
||||
}
|
||||
command_task_vars = {'become': True, 'ignore_errors': True}
|
||||
command_task_vars = {
|
||||
'become': True,
|
||||
'ignore_errors': True,
|
||||
'ansible_facts': task_vars.get('ansible_facts', {}),
|
||||
'ansible_delegated_vars': task_vars.get('ansible_delegated_vars', {})
|
||||
}
|
||||
command_result = self._execute_module(
|
||||
'command',
|
||||
module_args=command_args,
|
||||
|
|
Loading…
Reference in New Issue