openstack/kolla-ansible
Code Issues Proposed changes

Ansible2.0 changes: ansible_ssh_user to ansible_user

Browse Source 
Ansible 2.0 has deprecated the 'ssh' from ansible_ssh_user to become ansible_user.

Change-Id: I15813f638accaa6a31f75dad0b854814264ac493
Closes-Bug: #1635145
This commit is contained in:
zeyu Zhu 2016-10-20 15:58:03 +08:00
parent 464b8fdc39
commit f982d4a2ca
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: if not tmp and len(make_tmp_path_args) == 1:
tmp = self._make_tmp_path() tmp = self._make_tmp_path()
if not tmp and len(make_tmp_path_args) == 2: 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) or self._play_context.remote_user)
tmp = self._make_tmp_path(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: if not tmp and len(make_tmp_path_args) == 1:
tmp = self._make_tmp_path() tmp = self._make_tmp_path()
if not tmp and len(make_tmp_path_args) == 2: 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) or self._play_context.remote_user)
tmp = self._make_tmp_path(remote_user) tmp = self._make_tmp_path(remote_user)
# save template args. # save template args.

2
ansible/inventory/multinode
View File

@ -7,7 +7,7 @@ control02
control03 control03
# The above can also be specified as follows: # 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 # The network nodes are where your l3-agent and loadbalancers will run
# This can be the same as a host in the control group # This can be the same as a host in the control group