aboutsummaryrefslogtreecommitdiffstats
path: root/puppet/services
diff options
context:
space:
mode:
Diffstat (limited to 'puppet/services')
-rw-r--r--puppet/services/heat-engine.yaml1
-rw-r--r--puppet/services/pacemaker/loadbalancer.yaml6
2 files changed, 3 insertions, 4 deletions
diff --git a/puppet/services/heat-engine.yaml b/puppet/services/heat-engine.yaml
index 51807f92..4a5ec2c0 100644
--- a/puppet/services/heat-engine.yaml
+++ b/puppet/services/heat-engine.yaml
@@ -49,7 +49,6 @@ outputs:
- '@'
- {get_param: [EndpointMap, MysqlInternal, host]}
- '/heat'
- heat::auth_uri: {get_param: [EndpointMap, KeystoneInternal, uri]}
heat::keystone_ec2_uri: {get_param: [EndpointMap, KeystoneEC2, uri]}
heat::identity_uri: {get_param: [EndpointMap, KeystoneAdmin, uri_no_suffix]}
heat::keystone_password: {get_param: HeatPassword}
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