summaryrefslogtreecommitdiffstats
path: root/puppet/services/pacemaker/database
diff options
context:
space:
mode:
authorJenkins <jenkins@review.openstack.org>2016-08-20 16:29:02 +0000
committerGerrit Code Review <review@openstack.org>2016-08-20 16:29:02 +0000
commit6c537d2005b8cb5b25f63722376fca08471987ac (patch)
tree0a45528088c74cd984ba2359738c52a30ecc7ffa /puppet/services/pacemaker/database
parent9b2281f8de84e730910342d40b12e37886203087 (diff)
parent3b62761d2fc25abef4ca98e9d5863197c4497b85 (diff)
Merge "Add DefaultPasswords to composable services"
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: