Reuse the various service passwords as db passwords.

[apex-tripleo-heat-templates.git] / controller.yaml

diff --git a/controller.yaml b/controller.yaml
index b578a25..9044ade 100644 (file)
--- a/controller.yaml
+++ b/controller.yaml
@@ -11,7 +11,7 @@ parameters:
     hidden: true
   AdminToken:
     default: unset
-    description: The keystone auth secret.
+    description: The keystone auth secret and db password.
     type: string
     hidden: true
   CeilometerMeteringSecret:
@@ -21,7 +21,7 @@ parameters:
     hidden: true
   CeilometerPassword:
     default: unset
-    description: The password for the ceilometer service account.
+    description: The password for the ceilometer service and db account.
     type: string
     hidden: true
   CinderEnableIscsiBackend:
@@ -42,7 +42,7 @@ parameters:
     type: number
   CinderPassword:
     default: unset
-    description: The password for the cinder service account, used by cinder-api.
+    description: The password for the cinder service and db account, used by cinder-api.
     type: string
     hidden: true
   CloudName:
@@ -133,7 +133,7 @@ parameters:
     default: ''
   GlancePassword:
     default: unset
-    description: The password for the glance service account, used by the glance services.
+    description: The password for the glance service and db account, used by the glance services.
     type: string
     hidden: true
   GlancePort:
@@ -146,7 +146,7 @@ parameters:
     type: string
   HeatPassword:
     default: unset
-    description: The password for the Heat service account, used by the Heat services.
+    description: The password for the Heat service and db account, used by the Heat services.
     type: string
     hidden: true
   HeatStackDomainAdminPassword:
@@ -272,7 +272,7 @@ parameters:
     type: string
   NeutronPassword:
     default: unset
-    description: The password for the neutron service account, used by neutron agents.
+    description: The password for the neutron service and db account, used by neutron agents.
     type: string
     hidden: true
   NeutronPublicInterface:
@@ -309,7 +309,7 @@ parameters:
     type: string
   NovaPassword:
     default: unset
-    description: The password for the nova service account, used by nova-api.
+    description: The password for the nova service and db account, used by nova-api.
     type: string
     hidden: true
   NtpServer:
@@ -709,7 +709,9 @@ resources:
         cinder_dsn:
           list_join:
             - ''
-            - - 'mysql://cinder:unset@'
+            - - 'mysql://cinder:'
+              - {get_param: CinderPassword}
+              - '@'
               - {get_param: VirtualIP}
               - '/cinder'
         glance_port: {get_param: GlancePort}
@@ -720,7 +722,9 @@ resources:
         glance_dsn:
           list_join:
             - ''
-            - - 'mysql://glance:unset@'
+            - - 'mysql://glance:'
+              - {get_param: GlancePassword}
+              - '@'
               - {get_param: VirtualIP}
               - '/glance'
         heat_password: {get_param: HeatPassword}
@@ -729,7 +733,9 @@ resources:
         heat_dsn:
           list_join:
             - ''
-            - - 'mysql://heat:unset@'
+            - - 'mysql://heat:'
+              - {get_param: HeatPassword}
+              - '@'
               - {get_param: VirtualIP}
               - '/heat'
         keystone_ca_certificate: {get_param: KeystoneCACertificate}
@@ -740,7 +746,9 @@ resources:
         keystone_dsn:
           list_join:
             - ''
-            - - 'mysql://keystone:unset@'
+            - - 'mysql://keystone:'
+              - {get_param: AdminToken}
+              - '@'
               - {get_param: VirtualIP}
               - '/keystone'
         mysql_innodb_buffer_pool_size: {get_param: MysqlInnodbBufferPoolSize}
@@ -770,7 +778,9 @@ resources:
         neutron_dsn:
           list_join:
             - ''
-            - - 'mysql://neutron:unset@'
+            - - 'mysql://neutron:'
+              - {get_param: NeutronPassword}
+              - '@'
               - {get_param: VirtualIP}
               - '/ovs_neutron?charset=utf8'
         ceilometer_metering_secret: {get_param: CeilometerMeteringSecret}
@@ -778,7 +788,9 @@ resources:
         ceilometer_dsn:
           list_join:
             - ''
-            - - 'mysql://ceilometer:unset@'
+            - - 'mysql://ceilometer:'
+              - {get_param: CeilometerPassword}
+              - '@'
               - {get_param: VirtualIP}
               - '/ceilometer'
         snmpd_readonly_user_name: {get_param: SnmpdReadonlyUserName}
@@ -787,7 +799,9 @@ resources:
         nova_dsn:
           list_join:
             - ''
-            - - 'mysql://nova:unset@'
+            - - 'mysql://nova:'
+              - {get_param: NovaPassword}
+              - '@'
               - {get_param: VirtualIP}
               - '/nova'
         rabbit_username: {get_param: RabbitUserName}