summaryrefslogtreecommitdiffstats
path: root/puppet/services
diff options
context:
space:
mode:
Diffstat (limited to 'puppet/services')
-rw-r--r--puppet/services/haproxy.yaml (renamed from puppet/services/loadbalancer.yaml)6
-rw-r--r--puppet/services/keepalived.yaml18
-rw-r--r--puppet/services/pacemaker/haproxy.yaml (renamed from puppet/services/pacemaker/loadbalancer.yaml)10
3 files changed, 26 insertions, 8 deletions
diff --git a/puppet/services/loadbalancer.yaml b/puppet/services/haproxy.yaml
index 1b9654fc..844637bc 100644
--- a/puppet/services/loadbalancer.yaml
+++ b/puppet/services/haproxy.yaml
@@ -1,7 +1,7 @@
heat_template_version: 2016-04-08
description: >
- Loadbalancer service configured with Puppet
+ HAproxy service configured with Puppet
parameters:
EndpointMap:
@@ -12,7 +12,7 @@ parameters:
outputs:
role_data:
- description: Role data for the Loadbalancer role.
+ description: Role data for the HAproxy role.
value:
step_config: |
- include ::tripleo::profile::base::loadbalancer
+ include ::tripleo::profile::base::haproxy
diff --git a/puppet/services/keepalived.yaml b/puppet/services/keepalived.yaml
new file mode 100644
index 00000000..09ce26b5
--- /dev/null
+++ b/puppet/services/keepalived.yaml
@@ -0,0 +1,18 @@
+heat_template_version: 2016-04-08
+
+description: >
+ Keepalived service configured with Puppet
+
+parameters:
+ EndpointMap:
+ default: {}
+ description: Mapping of service endpoint -> protocol. Typically set
+ via parameter_defaults in the resource registry.
+ type: json
+
+outputs:
+ role_data:
+ description: Role data for the Keepalived role.
+ value:
+ step_config: |
+ include ::tripleo::profile::base::keepalived
diff --git a/puppet/services/pacemaker/loadbalancer.yaml b/puppet/services/pacemaker/haproxy.yaml
index ce67e925..c2ca2816 100644
--- a/puppet/services/pacemaker/loadbalancer.yaml
+++ b/puppet/services/pacemaker/haproxy.yaml
@@ -1,7 +1,7 @@
heat_template_version: 2016-04-08
description: >
- Loadbalancer service with Pacemaker configured with Puppet
+ HAproxy service with Pacemaker configured with Puppet
parameters:
EndpointMap:
@@ -12,19 +12,19 @@ parameters:
resources:
LoadbalancerServiceBase:
- type: ../loadbalancer.yaml
+ type: ../haproxy.yaml
properties:
EndpointMap: {get_param: EndpointMap}
outputs:
role_data:
- description: Role data for the Loadbalancer pacemaker role.
+ description: Role data for the HAproxy with pacemaker role.
value:
config_settings:
map_merge:
- get_attr: [LoadbalancerServiceBase, role_data, config_settings]
- tripleo::haproxy::haproxy_service_manage: false
tripleo::haproxy::mysql_clustercheck: true
- tripleo::haproxy::keepalived: false
+ enable_keepalived: false
step_config: |
- include ::tripleo::profile::pacemaker::loadbalancer
+ include ::tripleo::profile::pacemaker::haproxy