summaryrefslogtreecommitdiffstats
path: root/puppet/services/pacemaker/loadbalancer.yaml
diff options
context:
space:
mode:
authorJenkins <jenkins@review.openstack.org>2016-05-31 12:40:32 +0000
committerGerrit Code Review <review@openstack.org>2016-05-31 12:40:32 +0000
commit9f45b39cd880980640cf369382dd92c35424e1ca (patch)
treed3ad342a3efd71ff4028568c8ad61bdb69910de8 /puppet/services/pacemaker/loadbalancer.yaml
parente3cc44579c0e632eb72c3ea9f58f2ab2bc27a251 (diff)
parent4087aff69b13843ab73538c65b4b5823d46fb629 (diff)
Merge "loadbalancer: update hiera parameters for HAproxy/keepalived split"
Diffstat (limited to 'puppet/services/pacemaker/loadbalancer.yaml')
-rw-r--r--puppet/services/pacemaker/loadbalancer.yaml6
1 files changed, 3 insertions, 3 deletions
diff --git a/puppet/services/pacemaker/loadbalancer.yaml b/puppet/services/pacemaker/loadbalancer.yaml
index be6825f6..ce67e925 100644
--- a/puppet/services/pacemaker/loadbalancer.yaml
+++ b/puppet/services/pacemaker/loadbalancer.yaml
@@ -23,8 +23,8 @@ outputs:
config_settings:
map_merge:
- get_attr: [LoadbalancerServiceBase, role_data, config_settings]
- - tripleo::loadbalancer::haproxy_service_manage: false
- tripleo::loadbalancer::mysql_clustercheck: true
- tripleo::loadbalancer::manage_vip: false
+ - tripleo::haproxy::haproxy_service_manage: false
+ tripleo::haproxy::mysql_clustercheck: true
+ tripleo::haproxy::keepalived: false
step_config: |
include ::tripleo::profile::pacemaker::loadbalancer