aboutsummaryrefslogtreecommitdiffstats
path: root/puppet/services/database
diff options
context:
space:
mode:
authorDan Prince <dprince@redhat.com>2016-08-18 12:30:14 -0400
committerDan Prince <dprince@redhat.com>2016-08-24 08:00:34 -0400
commitdb4d11f7f57944456807f5e3fbd1ab0417017f9e (patch)
tree391b3f1e1e6f13698c984b71fae5419b7a91bbac /puppet/services/database
parent95949a297574ee7e823fbeb4d8e7420432dcabe1 (diff)
Move Keepalived/HAproxy settings out of controller
This moves the config settings out of controller.yaml for Keepalived and HAproxy. NOTE: the tripleo::haproxy::redis_password wasn't getting set correctly before this patch. Looks like a breakages that occurred when puppet-tripleo dropped the loadbalancer class. Related-Bug: #1604414 Change-Id: Id24b02ac73f4ae33b20194da8a5f99f17403ece9
Diffstat (limited to 'puppet/services/database')
-rw-r--r--puppet/services/database/redis-base.yaml1
1 files changed, 0 insertions, 1 deletions
diff --git a/puppet/services/database/redis-base.yaml b/puppet/services/database/redis-base.yaml
index 301b2bb1..40711432 100644
--- a/puppet/services/database/redis-base.yaml
+++ b/puppet/services/database/redis-base.yaml
@@ -36,4 +36,3 @@ outputs:
redis::sentinel::master_name: '"%{hiera(\"bootstrap_nodeid\")}"'
redis::sentinel::redis_host: '"%{hiera(\"bootstrap_nodeid_ip\")}"'
redis::sentinel::notification_script: '/usr/local/bin/redis-notifications.sh'
- tripleo::loadbalancer::redis_password: {get_param: RedisPassword}