X-Git-Url: https://gerrit.opnfv.org/gerrit/gitweb?a=blobdiff_plain;f=mcp%2Freclass%2Fclasses%2Fcluster%2Fmcp-common-noha%2Fhaproxy_openstack_api.yml;h=dd3bc4761a87c9c5e652fe02e5a1c6b60d08913d;hb=6a1089b50dd5fbc4482c1590a116d7c75f82b734;hp=881d90dccd9e77704cb11f0aa15a4f8fd856014c;hpb=2c77ae5cc40df831e6cfa996ac192b7b4f7b24b3;p=fuel.git

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 881d90dcc..dd3bc4761 100644
--- 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:
@@ -101,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 405
           servers:
             - name: ctl01
               host: ${_param:cluster_node01_address}
@@ -138,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}