aboutsummaryrefslogtreecommitdiffstats
path: root/manifests
diff options
context:
space:
mode:
authorJenkins <jenkins@review.openstack.org>2015-07-14 16:59:22 +0000
committerGerrit Code Review <review@openstack.org>2015-07-14 16:59:22 +0000
commitf232fb20d1d41d41377d3f206603f2f4c0ba313b (patch)
tree020a9d3847ea95c3bb6c31581032f6c64cfd14b1 /manifests
parent8011d70a80501e4f5cccf0be7d870fba677a3c7c (diff)
parentec80b3e24a6606cf1dd2a215410beaf9ff2505e4 (diff)
Merge "Remove mode tcp enforcement where unneeded, we default to mode tcp"
Diffstat (limited to 'manifests')
-rw-r--r--manifests/loadbalancer.pp4
1 files changed, 0 insertions, 4 deletions
diff --git a/manifests/loadbalancer.pp b/manifests/loadbalancer.pp
index f9877a6..3826fcf 100644
--- a/manifests/loadbalancer.pp
+++ b/manifests/loadbalancer.pp
@@ -714,9 +714,6 @@ class tripleo::loadbalancer (
haproxy::listen { 'glance_registry':
ipaddress => hiera('glance_registry_vip', $controller_virtual_ip),
ports => 9191,
- options => {
- 'mode' => 'tcp',
- },
collect_exported => false,
}
haproxy::balancermember { 'glance_registry':
@@ -964,7 +961,6 @@ class tripleo::loadbalancer (
ports => 6379,
options => {
'timeout' => [ 'client 0', 'server 0' ],
- 'mode' => 'tcp',
'balance' => 'first',
'option' => ['tcp-check',],
'tcp-check' => ['send info\ replication\r\n','expect string role:master'],