From 58bf3932a86f2f5582937e3da8cb74dfd29c116b Mon Sep 17 00:00:00 2001 From: Dan Prince Date: Wed, 17 Aug 2016 10:15:05 -0400 Subject: 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 --- default_passwords.yaml | 3 --- 1 file changed, 3 deletions(-) (limited to 'default_passwords.yaml') 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} -- cgit 1.2.3-korg