From: Jenkins <jenkins@review.openstack.org>
Date: Wed, 27 May 2015 09:38:45 +0000 (+0000)
Subject: Merge "Reuse the various service passwords as db passwords."
X-Git-Tag: opnfv-6.0.0~2542
X-Git-Url: https://gerrit.opnfv.org/gerrit/gitweb?a=commitdiff_plain;h=42e7689e6faf485357a50470f1c83fc7b1d8c5da;p=apex-tripleo-heat-templates.git

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

42e7689e6faf485357a50470f1c83fc7b1d8c5da
diff --cc controller.yaml
index a2da3d39,9044ade3..403ef05a
--- a/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 puppet/controller-puppet.yaml
index b012b4f4,3014df9b..bbd3ec20
--- a/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: