From 244dcc434959eff291b4b6cc41993941db7e001e Mon Sep 17 00:00:00 2001
From: Emilien Macchi <emilien@redhat.com>
Date: Tue, 31 May 2016 16:50:19 -0400
Subject: Explode Loadbalancer role into HAproxy + keepalived

Split Loadbalancer into HAproxy & Keepalived roles.

Depends-On: I8aa9045fc80205485abab723968b26084f60bf71
Change-Id: If2723358099e78052c351a4a45fdf01d116a89df
---
 puppet/services/haproxy.yaml                | 18 +++++++++++++++++
 puppet/services/keepalived.yaml             | 18 +++++++++++++++++
 puppet/services/loadbalancer.yaml           | 18 -----------------
 puppet/services/pacemaker/haproxy.yaml      | 30 +++++++++++++++++++++++++++++
 puppet/services/pacemaker/loadbalancer.yaml | 30 -----------------------------
 5 files changed, 66 insertions(+), 48 deletions(-)
 create mode 100644 puppet/services/haproxy.yaml
 create mode 100644 puppet/services/keepalived.yaml
 delete mode 100644 puppet/services/loadbalancer.yaml
 create mode 100644 puppet/services/pacemaker/haproxy.yaml
 delete mode 100644 puppet/services/pacemaker/loadbalancer.yaml

(limited to 'puppet')

diff --git a/puppet/services/haproxy.yaml b/puppet/services/haproxy.yaml
new file mode 100644
index 00000000..844637bc
--- /dev/null
+++ b/puppet/services/haproxy.yaml
@@ -0,0 +1,18 @@
+heat_template_version: 2016-04-08
+
+description: >
+  HAproxy 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 HAproxy role.
+    value:
+      step_config: |
+        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/loadbalancer.yaml b/puppet/services/loadbalancer.yaml
deleted file mode 100644
index 1b9654fc..00000000
--- a/puppet/services/loadbalancer.yaml
+++ /dev/null
@@ -1,18 +0,0 @@
-heat_template_version: 2016-04-08
-
-description: >
-  Loadbalancer 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 Loadbalancer role.
-    value:
-      step_config: |
-        include ::tripleo::profile::base::loadbalancer
diff --git a/puppet/services/pacemaker/haproxy.yaml b/puppet/services/pacemaker/haproxy.yaml
new file mode 100644
index 00000000..c2ca2816
--- /dev/null
+++ b/puppet/services/pacemaker/haproxy.yaml
@@ -0,0 +1,30 @@
+heat_template_version: 2016-04-08
+
+description: >
+  HAproxy service with Pacemaker configured with Puppet
+
+parameters:
+  EndpointMap:
+    default: {}
+    description: Mapping of service endpoint -> protocol. Typically set
+                 via parameter_defaults in the resource registry.
+    type: json
+
+resources:
+  LoadbalancerServiceBase:
+    type: ../haproxy.yaml
+    properties:
+      EndpointMap: {get_param: EndpointMap}
+
+outputs:
+  role_data:
+    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
+            enable_keepalived: false
+      step_config: |
+        include ::tripleo::profile::pacemaker::haproxy
diff --git a/puppet/services/pacemaker/loadbalancer.yaml b/puppet/services/pacemaker/loadbalancer.yaml
deleted file mode 100644
index ce67e925..00000000
--- a/puppet/services/pacemaker/loadbalancer.yaml
+++ /dev/null
@@ -1,30 +0,0 @@
-heat_template_version: 2016-04-08
-
-description: >
-  Loadbalancer service with Pacemaker configured with Puppet
-
-parameters:
-  EndpointMap:
-    default: {}
-    description: Mapping of service endpoint -> protocol. Typically set
-                 via parameter_defaults in the resource registry.
-    type: json
-
-resources:
-  LoadbalancerServiceBase:
-    type: ../loadbalancer.yaml
-    properties:
-      EndpointMap: {get_param: EndpointMap}
-
-outputs:
-  role_data:
-    description: Role data for the Loadbalancer 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
-      step_config: |
-        include ::tripleo::profile::pacemaker::loadbalancer
-- 
cgit 1.2.3-korg