X-Git-Url: https://gerrit.opnfv.org/gerrit/gitweb?a=blobdiff_plain;f=puppet%2Fservices%2Fpacemaker%2Fhaproxy.yaml;h=50da411933ae6d8d887ce2089582069bd9c10aaa;hb=3243a1ab275648a17c98f47735a4490b59478d1e;hp=811a66972aa98c2dbede5ae5149ade1e803b9362;hpb=03732f871ba237ec02f43537cecf8ca802d66210;p=apex-tripleo-heat-templates.git

diff --git a/puppet/services/pacemaker/haproxy.yaml b/puppet/services/pacemaker/haproxy.yaml
index 811a6697..50da4119 100644
--- a/puppet/services/pacemaker/haproxy.yaml
+++ b/puppet/services/pacemaker/haproxy.yaml
@@ -1,9 +1,18 @@
-heat_template_version: 2016-04-08
+heat_template_version: ocata
 
 description: >
   HAproxy service with Pacemaker configured with Puppet
 
 parameters:
+  ServiceNetMap:
+    default: {}
+    description: Mapping of service_name -> network name. Typically set
+                 via parameter_defaults in the resource registry.  This
+                 mapping overrides those in ServiceNetMapDefaults.
+    type: json
+  DefaultPasswords:
+    default: {}
+    type: json
   EndpointMap:
     default: {}
     description: Mapping of service endpoint -> protocol. Typically set
@@ -14,6 +23,8 @@ resources:
   LoadbalancerServiceBase:
     type: ../haproxy.yaml
     properties:
+      ServiceNetMap: {get_param: ServiceNetMap}
+      DefaultPasswords: {get_param: DefaultPasswords}
       EndpointMap: {get_param: EndpointMap}
 
 outputs:
@@ -21,11 +32,11 @@ outputs:
     description: Role data for the HAproxy with pacemaker role.
     value:
       service_name: haproxy
+      monitoring_subscription: {get_attr: [LoadbalancerServiceBase, role_data, monitoring_subscription]}
       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