aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJenkins <jenkins@review.openstack.org>2015-09-10 01:28:09 +0000
committerGerrit Code Review <review@openstack.org>2015-09-10 01:28:09 +0000
commite7c30a2fd4ae5120c7fb6941d7b9d392bf7ac88f (patch)
tree0572ac65f089623eea319635e2846de0560537d0
parentad670bb30c698571dfbaf5d894deff32f7a69010 (diff)
parent226dde89acae5da3f5fde9908844d7bf7cf98ad7 (diff)
downloadkolla-e7c30a2fd4ae5120c7fb6941d7b9d392bf7ac88f.tar.gz
kolla-e7c30a2fd4ae5120c7fb6941d7b9d392bf7ac88f.zip
Merge "Change default ansible_ssh_user to "kolla""
-rw-r--r--ansible/group_vars/all.yml3
-rw-r--r--ansible/inventory/multinode8
2 files changed, 7 insertions, 4 deletions
diff --git a/ansible/group_vars/all.yml b/ansible/group_vars/all.yml
index 6df5c7ba9..9ced61ee9 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 f6ce047a7..924c4ac84 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