openstack
/
tripleo-ansible
Code Issues Proposed changes

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 commit f38b4c97b9)
This commit is contained in:
Oliver Walsh 2020-09-01 21:43:16 +01:00
parent c85083ebd0
commit 65ce477988
1 changed files with 16 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
tripleo_ansible/ansible_plugins/action/tripleo_nova_image_cache.py
View File

@ -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,