diff options
| author | zeyu Zhu <zhu.zeyu@zte.com.cn> | 2016-10-20 15:58:03 +0800 |
|---|---|---|
| committer | zeyu Zhu <zhu.zeyu@zte.com.cn> | 2016-10-20 17:09:22 +0800 |
| commit | f982d4a2ca2d84833bed4361ff8c75639e904a6c (patch) | |
| tree | 29d77d6ebf528a426051356e83329586034e49d5 /ansible/action_plugins | |
| parent | 464b8fdc39f6cb73b625d55081191d77b6873d32 (diff) | |
| download | kolla-ansible-f982d4a2ca2d84833bed4361ff8c75639e904a6c.tar.gz kolla-ansible-f982d4a2ca2d84833bed4361ff8c75639e904a6c.zip | |
Ansible2.0 changes: ansible_ssh_user to ansible_user
Ansible 2.0 has deprecated the 'ssh' from ansible_ssh_user to become ansible_user.
Change-Id: I15813f638accaa6a31f75dad0b854814264ac493
Closes-Bug: #1635145
Diffstat (limited to 'ansible/action_plugins')
| -rw-r--r-- | ansible/action_plugins/merge_configs.py | 2 | ||||
| -rwxr-xr-x | ansible/action_plugins/merge_yaml.py | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/ansible/action_plugins/merge_configs.py b/ansible/action_plugins/merge_configs.py index dd4e382db..7218a2ac9 100644 --- a/ansible/action_plugins/merge_configs.py +++ b/ansible/action_plugins/merge_configs.py @@ -49,7 +49,7 @@ class ActionModule(action.ActionBase): if not tmp and len(make_tmp_path_args) == 1: tmp = self._make_tmp_path() if not tmp and len(make_tmp_path_args) == 2: - remote_user = (task_vars.get('ansible_ssh_user') + remote_user = (task_vars.get('ansible_user') or self._play_context.remote_user) tmp = self._make_tmp_path(remote_user) diff --git a/ansible/action_plugins/merge_yaml.py b/ansible/action_plugins/merge_yaml.py index 76410833b..34ba7fb8d 100755 --- a/ansible/action_plugins/merge_yaml.py +++ b/ansible/action_plugins/merge_yaml.py @@ -57,7 +57,7 @@ class ActionModule(action.ActionBase): if not tmp and len(make_tmp_path_args) == 1: tmp = self._make_tmp_path() if not tmp and len(make_tmp_path_args) == 2: - remote_user = (task_vars.get('ansible_ssh_user') + remote_user = (task_vars.get('ansible_user') or self._play_context.remote_user) tmp = self._make_tmp_path(remote_user) # save template args. |