commit 0b56b97019220f244e43d0b3780e85fe3469e821
author mcp-jenkins <mcp-jenkins@mirantis.com> Fri Feb 23 13:52:50 2018 +0000
committer Gerrit Code Review <gerrit2@56fc70e46927> Fri Feb 23 13:52:50 2018 +0000
tree 6dcac010361a399b26b2cd58d5d3159320fefac5
parent 8deb07e103e7559efd07eec65e9f6c5b5b36ac32
parent f3ddbb7308475f60e195cd6e26988e69169dc312

Merge "Fix status check for nova-placement haproxy site"

haproxy/proxy/listen/openstack/nova-placement.yml

diff --git a/haproxy/proxy/listen/openstack/nova-placement.yml b/haproxy/proxy/listen/openstack/nova-placement.yml
index de0504b..58c9dd2 100644
--- a/haproxy/proxy/listen/openstack/nova-placement.yml
+++ b/haproxy/proxy/listen/openstack/nova-placement.yml
@@ -2,9 +2,18 @@
   haproxy:
     proxy:
       listen:
+        # Nova placement API returns 401 when doing GET to root URL, while
+        # other serivces normally returns 200 and API versions data.
         nova_placement_api:
-          type: openstack-service
+          mode: http
           service_name: nova_placement
+          options:
+            - httpclose
+            - httplog
+          health-check:
+            http:
+              options:
+              - expect status 401
           binds:
           - address: ${_param:cluster_vip_address}
             port: 8778