aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJenkins <jenkins@review.openstack.org>2014-11-14 10:10:14 +0000
committerGerrit Code Review <review@openstack.org>2014-11-14 10:10:14 +0000
commit3043a28d07b6d45436406627c9ace185543529e6 (patch)
tree79469450a2e1b3c3a6977fe84f8f57f7d9a59881
parent8b17c4939dfb71e423f87adf2556290aee7da7f3 (diff)
parent2cab499f433e9a88ed4017399f3ca1e66bf8effa (diff)
Merge "Use HAProxy httpchk for openstack services"
-rw-r--r--overcloud-source.yaml6
1 files changed, 6 insertions, 0 deletions
diff --git a/overcloud-source.yaml b/overcloud-source.yaml
index bc36e90b..c08dcbde 100644
--- a/overcloud-source.yaml
+++ b/overcloud-source.yaml
@@ -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: