From 226dde89acae5da3f5fde9908844d7bf7cf98ad7 Mon Sep 17 00:00:00 2001
From: Paul Bourke <paul.bourke@oracle.com>
Date: Wed, 9 Sep 2015 11:56:44 +0100
Subject: [PATCH] Change default ansible_ssh_user to "kolla"

Chnage to "kolla", and set in globals to easily apply to all nodes.

DocImpact
Closes-Bug: #1493801

Change-Id: I6cd53be9f542dbcbd3f1459bc5fc2721d56c5022
---
 ansible/group_vars/all.yml  | 3 +++
 ansible/inventory/multinode | 8 ++++----
 2 files changed, 7 insertions(+), 4 deletions(-)

diff --git a/ansible/group_vars/all.yml b/ansible/group_vars/all.yml
index 34985a0594..79b0a4f9e3 100644
--- a/ansible/group_vars/all.yml
+++ b/ansible/group_vars/all.yml
@@ -13,6 +13,9 @@ node_templates_directory: "/usr/share/kolla/templates"
 # The directory to store the config files on the destination node
 node_config_directory: "/etc/kolla"
 
+# The user Ansible uses to ssh to target nodes
+ansible_ssh_user: "kolla"
+
 
 ###################
 # Kolla options
diff --git a/ansible/inventory/multinode b/ansible/inventory/multinode
index 1d4e1fb7fd..0f39ee901d 100644
--- a/ansible/inventory/multinode
+++ b/ansible/inventory/multinode
@@ -2,12 +2,12 @@
 # additional groups are for more control of the environment.
 [control]
 # These hostname must be resolvable from your deployment host
-control01       ansible_ssh_user=sam
-control02       ansible_ssh_user=sam
-control03       ansible_ssh_user=sam
+control01
+control02
+control03
 
 # The above can also be specified as follows:
-#control[01:03]     ansible_ssh_user=sam
+#control[01:03]     ansible_ssh_user=kolla
 
 # The network nodes are where your l3-agent and loadbalancers will run
 # This can be the same as a a host in the control group