X-Git-Url: https://gerrit.opnfv.org/gerrit/gitweb?a=blobdiff_plain;f=cinder-storage.yaml;h=47a97081b916290c816ec0c247a0fba3f57c618f;hb=4a1bc7459886c85d88749447d4179be686743630;hp=30eae1d920abdbff3004461230954ab699161525;hpb=8bdb82deb9423d1f7de2b479f97f92fb66ab3c81;p=apex-tripleo-heat-templates.git

diff --git a/cinder-storage.yaml b/cinder-storage.yaml
index 30eae1d9..47a97081 100644
--- a/cinder-storage.yaml
+++ b/cinder-storage.yaml
@@ -16,6 +16,11 @@ parameters:
     default: 5000
     description: The size of the loopback file used by the cinder LVM driver.
     type: number
+  CinderPassword:
+    default: unset
+    description: The password for the cinder service and db account, used by cinder-api.
+    type: string
+    hidden: true
   VirtualIP:
     default: ''
     type: string
@@ -95,6 +100,16 @@ parameters:
     description: The user password for SNMPd with readonly rights running on all Overcloud nodes
     type: string
     hidden: true
+  UpdateIdentifier:
+    default: ''
+    type: string
+    description: >
+      Setting to a previously unused value during stack-update will trigger
+      package update on all nodes
+  Hostname:
+    type: string
+    default: '' # Defaults to Heat created hostname
+
 resources:
   BlockStorage:
     type: OS::Nova::Server
@@ -107,6 +122,7 @@ resources:
         - network: ctlplane
       user_data_format: SOFTWARE_CONFIG
       user_data: {get_resource: NodeUserData}
+      name: {get_param: Hostname}
 
   NodeUserData:
     type: OS::TripleO::NodeUserData
@@ -146,7 +162,7 @@ resources:
       config: {get_resource: BlockStorageConfig}
       input_values:
         controller_virtual_ip: {get_param: VirtualIP}
-        cinder_dsn: {list_join: ['', ['mysql://cinder:unset@', {get_param: VirtualIP} , '/cinder']]}
+        cinder_dsn: {list_join: ['', ['mysql://cinder:', {get_param: CinderPassword}, '@', {get_param: VirtualIP} , '/cinder']]}
         snmpd_readonly_user_name: {get_param: SnmpdReadonlyUserName}
         snmpd_readonly_user_password: {get_param: SnmpdReadonlyUserPassword}
       signal_transport: NO_SIGNAL