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

diff --cc cinder-storage.yaml
Simple merge

diff --cc controller.yaml
index a2da3d3,9044ade..403ef05
--- 1/controller.yaml
--- 2/controller.yaml
+++ b/controller.yaml
@@@ -11,13 -11,9 +11,13 @@@ parameters
      hidden: true
    AdminToken:
      default: unset
-     description: The keystone auth secret.
+     description: The keystone auth secret and db password.
      type: string
      hidden: true
 +  CeilometerBackend:
 +    default: 'mongodb'
 +    description: The ceilometer backend type.
 +    type: string
    CeilometerMeteringSecret:
      default: unset
      description: Secret shared by the ceilometer services.
@@@ -148,16 -144,9 +148,16 @@@
      default: http
      description: Protocol to use when connecting to glance, set to https for SSL.
      type: string
 +  GlanceBackend:
 +    default: swift
 +    description: The short name of the Glance backend to use. Should be one
 +      of swift, rbd, or file
 +    type: string
 +    constraints:
 +    - 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:

diff --cc overcloud-without-mergepy.yaml
Simple merge

diff --cc puppet/cinder-storage-puppet.yaml
Simple merge

diff --cc puppet/controller-puppet.yaml
index b012b4f,3014df9..bbd3ec2
--- 1/puppet/controller-puppet.yaml
--- 2/puppet/controller-puppet.yaml
+++ b/puppet/controller-puppet.yaml
@@@ -11,13 -11,9 +11,13 @@@ parameters
      hidden: true
    AdminToken:
      default: unset
-     description: The keystone auth secret.
+     description: The keystone auth secret and db password.
      type: string
      hidden: true
 +  CeilometerBackend:
 +    default: 'mongodb'
 +    description: The ceilometer backend type.
 +    type: string
    CeilometerMeteringSecret:
      default: unset
      description: Secret shared by the ceilometer services.
@@@ -148,16 -144,9 +148,16 @@@
      default: http
      description: Protocol to use when connecting to glance, set to https for SSL.
      type: string
 +  GlanceBackend:
 +    default: swift
 +    description: The short name of the Glance backend to use. Should be one
 +      of swift, rbd, or file
 +    type: string
 +    constraints:
 +    - 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: