aboutsummaryrefslogtreecommitdiffstats
path: root/default_passwords.yaml
diff options
context:
space:
mode:
authorDan Prince <dprince@redhat.com>2016-08-17 10:15:05 -0400
committerDan Prince <dprince@redhat.com>2016-08-23 21:29:02 -0400
commit58bf3932a86f2f5582937e3da8cb74dfd29c116b (patch)
treea6c333ff1d54f7d89807c8589149ae1287d3765d /default_passwords.yaml
parenta95e4c2afe614064f2ec8417f13b7b9719fc5e31 (diff)
Move MySQL settings out of puppet/controller.yaml
This moves the config settings out of controller.yaml for MySQL and into puppet/services/database/mysql.yaml. The top leve MysqlRootPassword is still maintained by default in overcloud.yaml so that users who upgrade won't get broken. New users may optionally specify the MysqlRootPassword as a parameter instead which will take priority over the top level generated parameter. We drop the top level MysqlClusterUniquePart because it is no longer used (I think it was a remnant from t-i-e). Related-Bug: #1604414 Change-Id: I06ebac0f4c87dabfccefb2e550a64650868c5b26
Diffstat (limited to 'default_passwords.yaml')
-rw-r--r--default_passwords.yaml3
1 files changed, 0 insertions, 3 deletions
diff --git a/default_passwords.yaml b/default_passwords.yaml
index a7d9c978..7a47f443 100644
--- a/default_passwords.yaml
+++ b/default_passwords.yaml
@@ -5,8 +5,6 @@ description: Passwords we manage at the top level
parameters:
DefaultMysqlRootPassword:
type: string
- DefaultMysqlClusterPassword:
- type: string
DefaultRabbitCookie:
type: string
DefaultHeatAuthEncryptionKey:
@@ -21,7 +19,6 @@ outputs:
description: Password data
value:
mysql_root_password: {get_param: DefaultMysqlRootPassword}
- mysql_cluster_password: {get_param: DefaultMysqlClusterPassword}
rabbit_cookie: {get_param: DefaultRabbitCookie}
heat_auth_encryption_key: {get_param: DefaultHeatAuthEncryptionKey}
pcsd_password: {get_param: DefaultPcsdPassword}