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

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)
 

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.

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