summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJenkins <jenkins@review.openstack.org>2015-07-14 17:10:30 +0000
committerGerrit Code Review <review@openstack.org>2015-07-14 17:10:30 +0000
commit9b22f9f4ddfd511d19f3e34d7be70092a79d18d7 (patch)
tree1e9c7515f79ec3f79cd4e00f9918bbf33ab17d51
parentf232fb20d1d41d41377d3f206603f2f4c0ba313b (diff)
parent21cea3602548a0d58e662eaa0f55e12a62f7291d (diff)
Merge "Add missing options to Ceilometer/Ironic/Horizon"
-rw-r--r--manifests/loadbalancer.pp5
1 files changed, 3 insertions, 2 deletions
diff --git a/manifests/loadbalancer.pp b/manifests/loadbalancer.pp
index 3826fcf..589d852 100644
--- a/manifests/loadbalancer.pp
+++ b/manifests/loadbalancer.pp
@@ -804,7 +804,7 @@ class tripleo::loadbalancer (
ports => '8777',
ipaddresses => hiera('ceilometer_api_node_ips', $controller_hosts_real),
server_names => $controller_hosts_names_real,
- options => [],
+ options => ['check', 'inter 2000', 'rise 2', 'fall 5'],
}
}
@@ -880,6 +880,7 @@ class tripleo::loadbalancer (
bind => $horizon_bind_opts,
options => {
'option' => [ 'httpchk GET /' ],
+ 'cookie' => 'SERVERID insert indirect nocache',
},
collect_exported => false,
}
@@ -917,7 +918,7 @@ class tripleo::loadbalancer (
ports => '6385',
ipaddresses => hiera('ironic_api_node_ips', $controller_hosts_real),
server_names => $controller_hosts_names_real,
- options => [],
+ options => ['check', 'inter 2000', 'rise 2', 'fall 5'],
}
}