summaryrefslogtreecommitdiffstats
path: root/puppet/services/pacemaker/database
diff options
context:
space:
mode:
authorDan Prince <dprince@redhat.com>2016-08-17 09:26:05 -0400
committerDan Prince <dprince@redhat.com>2016-08-18 12:45:30 -0400
commit3b62761d2fc25abef4ca98e9d5863197c4497b85 (patch)
treef58b10696e2ce5e38d9233d29674457c804f3c0e /puppet/services/pacemaker/database
parent885b37c80ecdae308289cc2e5c2a29dc66710487 (diff)
Add DefaultPasswords to composable services
This patch adds a new DefaultPasswords parameter to composable services. This is needed to help provide access to top level password resources that overcloud.yaml currently manages (passwords for Rabbit, Mysql, etc.). Moving the RandomString resources into composable services would cause them to regenerate within the stack. With this approach we can leave them where they are while we deprecate the top level mechanism and move the code that uses the passwords into the composable services. Change-Id: I4f21603c58a169a093962594e860933306879e3f
Diffstat (limited to 'puppet/services/pacemaker/database')
-rw-r--r--puppet/services/pacemaker/database/mongodb.yaml4
-rw-r--r--puppet/services/pacemaker/database/mysql.yaml3
-rw-r--r--puppet/services/pacemaker/database/redis.yaml4
3 files changed, 11 insertions, 0 deletions
diff --git a/puppet/services/pacemaker/database/mongodb.yaml b/puppet/services/pacemaker/database/mongodb.yaml
index b53d9c3d..64ae2e91 100644
--- a/puppet/services/pacemaker/database/mongodb.yaml
+++ b/puppet/services/pacemaker/database/mongodb.yaml
@@ -11,6 +11,9 @@ parameters:
via parameter_defaults in the resource registry. This
mapping overrides those in ServiceNetMapDefaults.
type: json
+ DefaultPasswords:
+ default: {}
+ type: json
EndpointMap:
default: {}
description: Mapping of service endpoint -> protocol. Typically set
@@ -22,6 +25,7 @@ resources:
type: ../../database/mongodb-base.yaml
properties:
ServiceNetMap: {get_param: ServiceNetMap}
+ DefaultPasswords: {get_param: DefaultPasswords}
EndpointMap: {get_param: EndpointMap}
outputs:
diff --git a/puppet/services/pacemaker/database/mysql.yaml b/puppet/services/pacemaker/database/mysql.yaml
index 67433caa..e63a8f1e 100644
--- a/puppet/services/pacemaker/database/mysql.yaml
+++ b/puppet/services/pacemaker/database/mysql.yaml
@@ -11,6 +11,9 @@ parameters:
via parameter_defaults in the resource registry. This
mapping overrides those in ServiceNetMapDefaults.
type: json
+ DefaultPasswords:
+ default: {}
+ type: json
EndpointMap:
default: {}
description: Mapping of service endpoint -> protocol. Typically set
diff --git a/puppet/services/pacemaker/database/redis.yaml b/puppet/services/pacemaker/database/redis.yaml
index dd677a93..d9156e67 100644
--- a/puppet/services/pacemaker/database/redis.yaml
+++ b/puppet/services/pacemaker/database/redis.yaml
@@ -10,6 +10,9 @@ parameters:
via parameter_defaults in the resource registry. This
mapping overrides those in ServiceNetMapDefaults.
type: json
+ DefaultPasswords:
+ default: {}
+ type: json
EndpointMap:
default: {}
description: Mapping of service endpoint -> protocol. Typically set
@@ -21,6 +24,7 @@ resources:
type: ../../database/redis-base.yaml
properties:
ServiceNetMap: {get_param: ServiceNetMap}
+ DefaultPasswords: {get_param: DefaultPasswords}
EndpointMap: {get_param: EndpointMap}
outputs: