summaryrefslogtreecommitdiffstats
path: root/puppet/services/pacemaker/database
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 /puppet/services/pacemaker/database
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 'puppet/services/pacemaker/database')
-rw-r--r--puppet/services/pacemaker/database/mysql.yaml10
1 files changed, 10 insertions, 0 deletions
diff --git a/puppet/services/pacemaker/database/mysql.yaml b/puppet/services/pacemaker/database/mysql.yaml
index e63a8f1e..d555ed0a 100644
--- a/puppet/services/pacemaker/database/mysql.yaml
+++ b/puppet/services/pacemaker/database/mysql.yaml
@@ -20,11 +20,21 @@ parameters:
via parameter_defaults in the resource registry.
type: json
+resources:
+
+ MysqlBase:
+ type: ../../database/mysql.yaml
+ properties:
+ ServiceNetMap: {get_param: ServiceNetMap}
+ DefaultPasswords: {get_param: DefaultPasswords}
+ EndpointMap: {get_param: EndpointMap}
+
outputs:
role_data:
description: Service MySQL with Pacemaker using composable services.
value:
service_name: mysql
config_settings:
+ get_attr: [MysqlBase, role_data, config_settings]
step_config: |
include ::tripleo::profile::pacemaker::database::mysql