aboutsummaryrefslogtreecommitdiffstats
path: root/puppet/services/pacemaker
diff options
context:
space:
mode:
authorDan Prince <dprince@redhat.com>2016-10-04 10:04:44 -0400
committerDan Prince <dprince@redhat.com>2016-10-04 10:04:44 -0400
commit3fa2ab420c2ba354fd709857e1ceaacf36a0f1b5 (patch)
tree958c8b5ea6d9efbac791193a1e06a53f0445b695 /puppet/services/pacemaker
parentccbc75a814e059f63453c2b40cc100709e858927 (diff)
Include redis/mongo hiera when using pacemaker
This patch updates the pacemaker composable service templates for mongo and redis to extend the proper base (redis.yaml and mongo.yaml) templates instead of the -base.yaml versions. This was causing some missing hiera settings for these services which caused symptoms like missing firewall rules for these services. Change-Id: I3f94acbf4d1baadbb151b1c4d34b4a0ab28ad5e5 Partial-bug: #1629934
Diffstat (limited to 'puppet/services/pacemaker')
-rw-r--r--puppet/services/pacemaker/database/mongodb.yaml2
-rw-r--r--puppet/services/pacemaker/database/redis.yaml2
2 files changed, 2 insertions, 2 deletions
diff --git a/puppet/services/pacemaker/database/mongodb.yaml b/puppet/services/pacemaker/database/mongodb.yaml
index 64ae2e91..982b6064 100644
--- a/puppet/services/pacemaker/database/mongodb.yaml
+++ b/puppet/services/pacemaker/database/mongodb.yaml
@@ -22,7 +22,7 @@ parameters:
resources:
MongoDbBase:
- type: ../../database/mongodb-base.yaml
+ type: ../../database/mongodb.yaml
properties:
ServiceNetMap: {get_param: ServiceNetMap}
DefaultPasswords: {get_param: DefaultPasswords}
diff --git a/puppet/services/pacemaker/database/redis.yaml b/puppet/services/pacemaker/database/redis.yaml
index d9156e67..196754eb 100644
--- a/puppet/services/pacemaker/database/redis.yaml
+++ b/puppet/services/pacemaker/database/redis.yaml
@@ -21,7 +21,7 @@ parameters:
resources:
RedisBase:
- type: ../../database/redis-base.yaml
+ type: ../../database/redis.yaml
properties:
ServiceNetMap: {get_param: ServiceNetMap}
DefaultPasswords: {get_param: DefaultPasswords}