Merge "Use HAProxy httpchk for openstack services"

This commit is contained in:
Jenkins 2014-11-14 10:10:14 +00:00 committed by Gerrit Code Review
commit 3043a28d07

@ -780,6 +780,8 @@ resources:
net_binds:
- &control_vip {ip: {get_attr: [ControlVirtualIP, fixed_ips, 0, ip_address]}}
- &public_vip {ip: {get_attr: [PublicVirtualIP, fixed_ips, 0, ip_address]}}
options:
- option httpchk GET /
services:
- name: keystone_admin
port: 35357
@ -795,6 +797,7 @@ resources:
port: 9292
- name: glance_registry
port: 9191
options: # overwrite options as glace_reg needs auth for http req
- name: heat_api
port: 8004
- name: heat_cloudwatch
@ -820,8 +823,11 @@ resources:
port: 6080
- name: ceilometer
port: 8777
options: # overwrite options as ceil needs auth for http req
- name: swift_proxy_server
port: 8080
options:
- option httpchk GET /info
- name: rabbitmq
port: 5672
net_binds: