x/compass-core
Code Issues Proposed changes

Add "cluster_name" to ansible global variables.

Browse Source 
Change-Id: I774a1d7c3182d6fe1d217728e494dc7f43c47325
This commit is contained in:
Xicheng Chang
2015-04-21 17:29:20 -07:00
parent 5d5ad29ec1
commit ada7d4e4bf
3 changed files with 8 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
conf/templates/ansible_installer/openstack_juno/vars/allinone.tmpl
View File

@@ -1,3 +1,4 @@
#set cluster_name = $getVar('name', '')
#set controllers = $getVar('allinone_compute', []) #set controllers = $getVar('allinone_compute', [])
#if not $isinstance($controllers, list) #if not $isinstance($controllers, list)
#set controllers = [$controllers] #set controllers = [$controllers]
@@ -29,6 +30,7 @@ identity_host: "{{ controller_host }}"
network_server_host: "{{ controller_host }}" network_server_host: "{{ controller_host }}"
dashboard_host: "{{ controller_host }}" dashboard_host: "{{ controller_host }}"
cluster_name: $cluster_name
odl_controller: 10.1.0.15 odl_controller: 10.1.0.15
DEBUG: False DEBUG: False

3
conf/templates/ansible_installer/openstack_juno/vars/multinodes.tmpl
View File

@@ -1,3 +1,4 @@
#set cluster_name = $getVar('name', '')
#set compute_controllers = $getVar('compute_controller', []) #set compute_controllers = $getVar('compute_controller', [])
#set compute_workers = $getVar('compute_worker', []) #set compute_workers = $getVar('compute_worker', [])
#set network_servers = $getVar('network_server', []) #set network_servers = $getVar('network_server', [])
@@ -89,6 +90,8 @@ INTERNAL_INTERFACE: $network_internal_nic
#set rabbit_username = $credentials.rabbitmq.username #set rabbit_username = $credentials.rabbitmq.username
#set rabbit_password = $credentials.rabbitmq.password #set rabbit_password = $credentials.rabbitmq.password
cluster_name: $cluster_name
odl_controller: 10.1.0.15 odl_controller: 10.1.0.15
DEBUG: False DEBUG: False

3
conf/templates/ansible_installer/openstack_juno/vars/single-controller.tmpl
View File

@@ -1,3 +1,4 @@
#set cluster_name = $getVar('name', '')
#set controllers = $getVar('controller', []) #set controllers = $getVar('controller', [])
#set computes = $getVar('compute', []) #set computes = $getVar('compute', [])
#set networks = $getVar('network', []) #set networks = $getVar('network', [])
@@ -32,6 +33,8 @@ INTERNAL_INTERFACE: $network_internal_nic
#set rabbit_username = $credentials.rabbitmq.username #set rabbit_username = $credentials.rabbitmq.username
#set rabbit_password = $credentials.rabbitmq.password #set rabbit_password = $credentials.rabbitmq.password
cluster_name: $cluster_name
compute_controller_host: "{{ controller_host }}" compute_controller_host: "{{ controller_host }}"
db_host: "{{ controller_host }}" db_host: "{{ controller_host }}"
rabbit_host: "{{ controller_host }}" rabbit_host: "{{ controller_host }}"