provide improved haproxy configuration and an alternative gobetween configuration

cockroach/cockroach-gobetween.toml

@@ -0,0 +1,21 @@
+##
+##  cockroach-gobetween.toml -- GoBetween Server Definition for Consul-managed CockroachDB cluster
+##
+
+[servers]
+
+    [servers.cockroach]
+     protocol                        = "tcp"
+     bind                            = "127.0.0.1:26257"
+     balance                         = "roundrobin"
+
+         [servers.cockroach.discovery]
+         kind                        = "consul"
+         consul_host                 = "127.0.0.1:8500"
+         consul_service_passing_only = true
+         consul_service_name         = "cockroach"
+         consul_service_tag          = ""
+         interval                    = "1s"
+         timeout                     = "2s"
+         failpolicy                  = "keeplast"
+

cockroach/cockroach-haproxy.cfg

@@ -1,31 +1,33 @@
 ##
-##  cockroach-haproxy.cfg -- HAProxy server configuration for CockroachDB cluster
+##  cockroach-haproxy.cfg -- HAProxy server configuration for Consul-managed CockroachDB cluster
 ##
 
 global
     daemon
-    log             127.0.0.1 local0 notice
-    user            @l_nusr@
-    group           @l_ngrp@
-    maxconn         4096
+    log                   127.0.0.1 local0 notice
+    user                  @l_nusr@
+    group                 @l_ngrp@
+    maxconn               4096
 
 defaults
-    log             global
-    mode            tcp
-    option          httplog
-    option          dontlognull
-    retries         3
+    log                   global
+    mode                  tcp
+    option                httplog
+    option                dontlognull
+    retries               3
     redispatch
-    maxconn         2000
-    timeout connect 5s
-    timeout client  60s
-    timeout server  60s
+    maxconn               2000
+    timeout connect       5s
+    timeout client        60s
+    timeout server        60s
 
 listen cockroach 127.0.0.1:26257
-    mode            tcp
-    balance         roundrobin
-    server          server1 127.0.0.1:26258 check inter 2000 rise 2 fall 5
-    server          server2 127.0.0.1:26259 check inter 2000 rise 2 fall 5
-    server          server3 127.0.0.1:26260 check inter 2000 rise 2 fall 5
-    timeout server  20s
+    mode                  tcp
+    balance               roundrobin
+    server-template       {{$servicename}} {{keyOrDefault $nbsrvkeyname "10"}} _{{$servicename}}._tcp.service.consul resolvers consul resolve-prefer ipv4 check inter 2000 rise 2 fall 5
+    timeout server        20s
+
+resolvers consul
+    nameserver            ns 127.0.0.1:8600
+    accepted_payload_size 8192
 

cockroach/cockroach.spec

@@ -45,8 +45,9 @@ Source2:      cockroach.sh
 Source3:      cockroach-psql.sh
 Source4:      cockroach-cert.sh
 Source5:      cockroach-haproxy.cfg
-Source6:      cockroach-consul.hcl
-Source7:      cockroach.conf
+Source6:      cockroach-gobetween.toml
+Source7:      cockroach-consul.hcl
+Source8:      cockroach.conf
 Patch0:       cockroach.patch
 
 #   build information
@@ -154,6 +155,7 @@ PreReq:       lzo, zlib
     #   install foreign tool configuration snippets
     %{l_shtool} install -c -m 644 %{l_value -s -a} \
         %{SOURCE cockroach-haproxy.cfg} \
+        %{SOURCE cockroach-gobetween.toml} \
         %{SOURCE cockroach-consul.hcl} \
         $RPM_BUILD_ROOT%{l_prefix}/share/cockroach/