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
changes/96/749396/1
Oliver Walsh 2 years ago
parent b62c354b1a
commit f38b4c97b9
  1. 19
      tripleo_ansible/ansible_plugins/action/tripleo_nova_image_cache.py

@ -77,7 +77,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,
@ -113,7 +117,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,
@ -131,7 +139,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…
Cancel
Save