Merge "Explode Loadbalancer role into HAproxy + keepalived"

6 files changed, 31 insertions, 11 deletions

diff --git a/environments/puppet-pacemaker.yaml b/environments/puppet-pacemaker.yaml
index 7f261591..e6326453 100644
--- a/environments/puppet-pacemaker.yaml
+++ b/environments/puppet-pacemaker.yaml
@@ -23,7 +23,7 @@ resource_registry:
   OS::TripleO::Services::NeutronL3Agent: ../puppet/services/pacemaker/neutron-l3.yaml
   OS::TripleO::Services::NeutronMetadataAgent: ../puppet/services/pacemaker/neutron-metadata.yaml
   OS::TripleO::Services::RabbitMQ: ../puppet/services/pacemaker/rabbitmq.yaml
-  OS::TripleO::Services::Loadbalancer: ../puppet/services/pacemaker/loadbalancer.yaml
+  OS::TripleO::Services::HAproxy: ../puppet/services/pacemaker/haproxy.yaml
   OS::TripleO::Services::Memcached: ../puppet/services/pacemaker/memcached.yaml
   OS::TripleO::Services::Redis: ../puppet/services/pacemaker/database/redis.yaml
   OS::TripleO::Services::NovaConductor: ../puppet/services/pacemaker/nova-conductor.yaml
diff --git a/overcloud-resource-registry-puppet.yaml b/overcloud-resource-registry-puppet.yaml
index 5b6ccbca..2fd48dda 100644
--- a/overcloud-resource-registry-puppet.yaml
+++ b/overcloud-resource-registry-puppet.yaml
@@ -136,7 +136,8 @@ resource_registry:
   OS::TripleO::Services::NeutronL3Agent: puppet/services/neutron-l3.yaml
   OS::TripleO::Services::NeutronMetadataAgent: puppet/services/neutron-metadata.yaml
   OS::TripleO::Services::RabbitMQ: puppet/services/rabbitmq.yaml
-  OS::TripleO::Services::Loadbalancer: puppet/services/loadbalancer.yaml
+  OS::TripleO::Services::HAproxy: puppet/services/haproxy.yaml
+  OS::TripleO::Services::Keepalived: puppet/services/keepalived.yaml
   OS::TripleO::Services::Memcached: puppet/services/memcached.yaml
   OS::TripleO::Services::SwiftProxy: puppet/services/swift-proxy.yaml
   OS::TripleO::Services::SaharaApi: puppet/services/sahara-api.yaml
diff --git a/overcloud.yaml b/overcloud.yaml
index e302299c..85f344ab 100644
--- a/overcloud.yaml
+++ b/overcloud.yaml
@@ -637,7 +637,8 @@ parameters:
       - OS::TripleO::Services::NeutronL3Agent
       - OS::TripleO::Services::NeutronMetadataAgent
       - OS::TripleO::Services::RabbitMQ
-      - OS::TripleO::Services::Loadbalancer
+      - OS::TripleO::Services::HAproxy
+      - OS::TripleO::Services::Keepalived
       - OS::TripleO::Services::Memcached
       - OS::TripleO::Services::SwiftProxy
       - OS::TripleO::Services::Redis
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