From ada7d4e4bf38d4b14107b228eb482137cb8d08a6 Mon Sep 17 00:00:00 2001
From: Xicheng Chang <xichengchang@huawei.com>
Date: Tue, 21 Apr 2015 17:29:20 -0700
Subject: [PATCH] Add "cluster_name" to ansible global variables.

Change-Id: I774a1d7c3182d6fe1d217728e494dc7f43c47325
---
 .../ansible_installer/openstack_juno/vars/allinone.tmpl        | 2 ++
 .../ansible_installer/openstack_juno/vars/multinodes.tmpl      | 3 +++
 .../openstack_juno/vars/single-controller.tmpl                 | 3 +++
 3 files changed, 8 insertions(+)

diff --git a/conf/templates/ansible_installer/openstack_juno/vars/allinone.tmpl b/conf/templates/ansible_installer/openstack_juno/vars/allinone.tmpl
index 7b7bf389..044356c5 100644
--- a/conf/templates/ansible_installer/openstack_juno/vars/allinone.tmpl
+++ b/conf/templates/ansible_installer/openstack_juno/vars/allinone.tmpl
@@ -1,3 +1,4 @@
+#set cluster_name = $getVar('name', '')
 #set controllers = $getVar('allinone_compute', [])
 #if not $isinstance($controllers, list)
     #set controllers = [$controllers]
@@ -29,6 +30,7 @@ identity_host: "{{ controller_host }}"
 network_server_host: "{{ controller_host }}"
 dashboard_host: "{{ controller_host }}"
 
+cluster_name: $cluster_name
 odl_controller: 10.1.0.15
 
 DEBUG: False
diff --git a/conf/templates/ansible_installer/openstack_juno/vars/multinodes.tmpl b/conf/templates/ansible_installer/openstack_juno/vars/multinodes.tmpl
index e4be390b..112a2dc8 100644
--- a/conf/templates/ansible_installer/openstack_juno/vars/multinodes.tmpl
+++ b/conf/templates/ansible_installer/openstack_juno/vars/multinodes.tmpl
@@ -1,3 +1,4 @@
+#set cluster_name = $getVar('name', '')
 #set compute_controllers = $getVar('compute_controller', [])
 #set compute_workers = $getVar('compute_worker', [])
 #set network_servers = $getVar('network_server', [])
@@ -89,6 +90,8 @@ INTERNAL_INTERFACE: $network_internal_nic
 #set rabbit_username = $credentials.rabbitmq.username
 #set rabbit_password = $credentials.rabbitmq.password
 
+cluster_name: $cluster_name
+
 odl_controller: 10.1.0.15
 
 DEBUG: False
diff --git a/conf/templates/ansible_installer/openstack_juno/vars/single-controller.tmpl b/conf/templates/ansible_installer/openstack_juno/vars/single-controller.tmpl
index b9297b3f..447946db 100644
--- a/conf/templates/ansible_installer/openstack_juno/vars/single-controller.tmpl
+++ b/conf/templates/ansible_installer/openstack_juno/vars/single-controller.tmpl
@@ -1,3 +1,4 @@
+#set cluster_name = $getVar('name', '')
 #set controllers = $getVar('controller', [])
 #set computes = $getVar('compute', [])
 #set networks = $getVar('network', [])
@@ -32,6 +33,8 @@ INTERNAL_INTERFACE: $network_internal_nic
 #set rabbit_username = $credentials.rabbitmq.username
 #set rabbit_password = $credentials.rabbitmq.password
 
+cluster_name: $cluster_name
+
 compute_controller_host: "{{ controller_host }}"
 db_host: "{{ controller_host }}"
 rabbit_host: "{{ controller_host }}"