openstack
/
tripleo-ansible
Code Issues Proposed changes

Merge "Workaround tripleo_nova_cache issue in ansible 2.9.11" into stable/ussuri

This commit is contained in:
Zuul 2020-09-04 13:42:45 +00:00 committed by Gerrit Code Review
parent a7b611f5a9 65ce477988
commit eadb9e345f
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 '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_result = self._execute_module(
'command', 'command',
module_args=command_args, module_args=command_args,
@ -115,7 +119,11 @@ class ActionModule(ActionBase):
"\"mkdir -p '{}'; chmod 755 '{}'\"" "\"mkdir -p '{}'; chmod 755 '{}'\""
).format(container_cli, cache_tmp, cache_tmp), ).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_result = self._execute_module(
'command', 'command',
module_args=command_args, module_args=command_args,
@ -133,7 +141,12 @@ class ActionModule(ActionBase):
cache_tmp 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_result = self._execute_module(
'command', 'command',
module_args=command_args, module_args=command_args,