Remove mode tcp enforcement where unneeded, we default to mode tcp
authorGiulio Fidente <gfidente@redhat.com>
Wed, 8 Jul 2015 11:27:13 +0000 (13:27 +0200)
committerGiulio Fidente <gfidente@redhat.com>
Wed, 8 Jul 2015 11:28:23 +0000 (13:28 +0200)
Change-Id: Ic0ae6b743a732ccd2cf7e395b5ab172bf3daaf7d

manifests/loadbalancer.pp

index f9877a6..3826fcf 100644 (file)
@@ -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'],