Merge "Reuse the various service passwords as db passwords."

1 files changed, 25 insertions, 13 deletions

diff --git a/puppet/controller-puppet.yaml b/puppet/controller-puppet.yaml
index b012b4f4..bbd3ec20 100644
--- a/puppet/controller-puppet.yaml
+++ b/puppet/controller-puppet.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
   CeilometerBackend:
@@ -25,7 +25,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:
@@ -46,7 +46,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:
@@ -137,7 +137,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:
@@ -157,7 +157,7 @@ parameters:
     - allowed_values: ['swift', 'file', 'rbd']
   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:
@@ -290,7 +290,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:
@@ -327,7 +327,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:
@@ -545,7 +545,9 @@ resources:
         cinder_dsn:
           list_join:
             - ''
-            - - 'mysql://cinder:unset@'
+            - - 'mysql://cinder:'
+              - {get_param: CinderPassword}
+              - '@'
               - {get_param: VirtualIP}
               - '/cinder'
         glance_port: {get_param: GlancePort}
@@ -558,7 +560,9 @@ resources:
         glance_dsn:
           list_join:
             - ''
-            - - 'mysql://glance:unset@'
+            - - 'mysql://glance:'
+              - {get_param: GlancePassword}
+              - '@'
               - {get_param: VirtualIP}
               - '/glance'
         heat_password: {get_param: HeatPassword}
@@ -566,7 +570,9 @@ resources:
         heat_dsn:
           list_join:
             - ''
-            - - 'mysql://heat:unset@'
+            - - 'mysql://heat:'
+              - {get_param: HeatPassword}
+              - '@'
               - {get_param: VirtualIP}
               - '/heat'
         keystone_ca_certificate: {get_param: KeystoneCACertificate}
@@ -577,7 +583,9 @@ resources:
         keystone_dsn:
           list_join:
             - ''
-            - - 'mysql://keystone:unset@'
+            - - 'mysql://keystone:'
+              - {get_param: AdminToken}
+              - '@'
               - {get_param: VirtualIP}
               - '/keystone'
         keystone_identity_uri:
@@ -622,7 +630,9 @@ resources:
         neutron_dsn:
           list_join:
             - ''
-            - - 'mysql://neutron:unset@'
+            - - 'mysql://neutron:'
+              - {get_param: NeutronPassword}
+              - '@'
               - {get_param: VirtualIP}
               - '/ovs_neutron?charset=utf8'
         neutron_url:
@@ -652,7 +662,9 @@ resources:
         nova_dsn:
           list_join:
             - ''
-            - - 'mysql://nova:unset@'
+            - - 'mysql://nova:'
+              - {get_param: NovaPassword}
+              - '@'
               - {get_param: VirtualIP}
               - '/nova'
         pcsd_password: {get_param: PcsdPassword}