Rectify system reclass after update

[fuel.git] / mcp / reclass / classes / cluster / mcp-common-noha / haproxy_openstack_api.yml

diff --git a/mcp/reclass/classes/cluster/mcp-common-noha/haproxy_openstack_api.yml b/mcp/reclass/classes/cluster/mcp-common-noha/haproxy_openstack_api.yml
index 7235071..dd3bc47 100644 (file)
--- a/mcp/reclass/classes/cluster/mcp-common-noha/haproxy_openstack_api.yml
+++ b/mcp/reclass/classes/cluster/mcp-common-noha/haproxy_openstack_api.yml
@@ -8,7 +8,7 @@
 ---
 parameters:
   _param:
-    haproxy_check: check inter 15s fastinter 2s downinter 4s rise 3 fall 3
+    haproxy_check: check inter 30m fastinter 2s downinter 4s rise 3 fall 3
   haproxy:
     proxy:
       listen:
@@ -45,17 +45,6 @@ parameters:
               host: ${_param:cluster_node01_address}
               port: 9191
               params: ${_param:haproxy_check}
-        heat_cloudwatch_api:
-          type: openstack-service
-          service_name: heat
-          binds:
-            - address: ${_param:cluster_vip_address}
-              port: 8003
-          servers:
-            - name: ctl01
-              host: ${_param:cluster_node01_address}
-              port: 8003
-              params: ${_param:haproxy_check}
         heat_api:
           type: openstack-service
           service_name: heat
@@ -112,17 +101,10 @@ parameters:
               port: 9696
               params: ${_param:haproxy_check}
         nova_placement_api:
-          mode: http
+          type: openstack-service
           binds:
             - address: ${_param:cluster_vip_address}
               port: 8778
-          options:
-            - httpclose
-            - httplog
-          health-check:
-            http:
-              options:
-                - expect status 401
           servers:
             - name: ctl01
               host: ${_param:cluster_node01_address}
@@ -149,25 +131,36 @@ parameters:
               host: ${_param:cluster_node01_address}
               port: 8775
               params: ${_param:haproxy_check}
-        ceilometer_api:
-          type: general-service
-          check: false
+        aodh-api:
+          type: openstack-service
+          service_name: aodh
           binds:
             - address: ${_param:cluster_vip_address}
-              port: 8777
+              port: 8042
           servers:
-            - name: ${_param:cluster_node01_hostname}
+            - name: ctl01
               host: ${_param:cluster_node01_address}
-              port: 8777
+              port: 8042
               params: ${_param:haproxy_check}
-        aodh-api:
+        barbican_api:
           type: openstack-service
-          service_name: aodh
+          service_name: barbican
           binds:
             - address: ${_param:cluster_vip_address}
-              port: 8042
+              port: 9311
           servers:
             - name: ctl01
               host: ${_param:cluster_node01_address}
-              port: 8042
+              port: 9311
+              params: ${_param:haproxy_check}
+        barbican_admin_api:
+          type: openstack-service
+          service_name: barbican
+          binds:
+            - address: ${_param:cluster_vip_address}
+              port: 9312
+          servers:
+            - name: ctl01
+              host: ${_param:cluster_node01_address}
+              port: 9312
               params: ${_param:haproxy_check}