diff options
| author | Jenkins <jenkins@review.openstack.org> | 2016-10-20 12:14:16 +0000 |
|---|---|---|
| committer | Gerrit Code Review <review@openstack.org> | 2016-10-20 12:14:16 +0000 |
| commit | b90f768724ff0d6f953afb942f31ae653174fd29 (patch) | |
| tree | 12ada581bea29e54491e8c8e514b693d37be9849 | |
| parent | 68e1f00ab2d7677536255b0d9822b0cfc4f5deea (diff) | |
| parent | f982d4a2ca2d84833bed4361ff8c75639e904a6c (diff) | |
| download | kolla-b90f768724ff0d6f953afb942f31ae653174fd29.tar.gz kolla-b90f768724ff0d6f953afb942f31ae653174fd29.zip | |
Merge "Ansible2.0 changes: ansible_ssh_user to ansible_user"
| -rw-r--r-- | ansible/action_plugins/merge_configs.py | 2 | ||||
| -rwxr-xr-x | ansible/action_plugins/merge_yaml.py | 2 | ||||
| -rw-r--r-- | ansible/inventory/multinode | 2 |
3 files changed, 3 insertions, 3 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. diff --git a/ansible/inventory/multinode b/ansible/inventory/multinode index c50eea2ba..150af0e93 100644 --- a/ansible/inventory/multinode +++ b/ansible/inventory/multinode @@ -7,7 +7,7 @@ control02 control03 # The above can also be specified as follows: -#control[01:03] ansible_ssh_user=kolla +#control[01:03] ansible_user=kolla # The network nodes are where your l3-agent and loadbalancers will run # This can be the same as a host in the control group |