openstack/kolla-ansible
Code Issues Proposed changes

Merge "Ansible2.0 changes: ansible_ssh_user to ansible_user"

Browse Source
This commit is contained in:
Jenkins 2016-10-20 12:14:16 +00:00 committed by Gerrit Code Review
commit b90f768724
3 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
ansible/action_plugins/merge_configs.py
View File

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

2
ansible/action_plugins/merge_yaml.py
View File

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

2
ansible/inventory/multinode
View File

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