From 9f18d5a9fc6759728a8f952e6248b5eb7cd50bc6 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Markus=20M=C3=A4kel=C3=A4?= <markus.makela@mariadb.com>
Date: Tue, 30 May 2017 12:59:40 +0300
Subject: [PATCH] Bring galera template to the replication template

The only difference in the galera template is now in the monitor
definition and in the server address values. This fixes the unexpected
responses that some of the galera mysqltest cases suffer from.
---
 .../cnf/maxscale.cnf.template.galera          | 26 +++++++++----------
 .../cnf/maxscale.cnf.template.replication     |  1 -
 2 files changed, 13 insertions(+), 14 deletions(-)

diff --git a/maxscale-system-test/cnf/maxscale.cnf.template.galera b/maxscale-system-test/cnf/maxscale.cnf.template.galera
index cff4440cb..70c459d96 100755
--- a/maxscale-system-test/cnf/maxscale.cnf.template.galera
+++ b/maxscale-system-test/cnf/maxscale.cnf.template.galera
@@ -16,11 +16,13 @@ router=readwritesplit
 servers=server1,server2,server3,server4
 user=maxskysql
 passwd=skysql
+router_options=slave_selection_criteria=LEAST_GLOBAL_CONNECTIONS
+max_slave_connections=1
 
 [Read Connection Router Slave]
 type=service
 router=readconnroute
-router_options= slave
+router_options=slave
 servers=server1,server2,server3,server4
 user=maxskysql
 passwd=skysql
@@ -38,7 +40,6 @@ type=listener
 service=RW Split Router
 protocol=MySQLClient
 port=4006
-#socket=/tmp/rwsplit.sock
 
 [Read Connection Listener Slave]
 type=listener
@@ -52,6 +53,16 @@ service=Read Connection Router Master
 protocol=MySQLClient
 port=4008
 
+[CLI]
+type=service
+router=cli
+
+[CLI Listener]
+type=listener
+service=CLI
+protocol=maxscaled
+socket=default
+
 [server1]
 type=server
 address=###galera_server_IP_1###
@@ -75,14 +86,3 @@ type=server
 address=###galera_server_IP_4###
 port=###galera_server_port_4###
 protocol=MySQLBackend
-
-[CLI]
-type=service
-router=cli
-
-[CLI Listener]
-type=listener
-service=CLI
-protocol=maxscaled
-#address=localhost
-socket=default
diff --git a/maxscale-system-test/cnf/maxscale.cnf.template.replication b/maxscale-system-test/cnf/maxscale.cnf.template.replication
index bd3d9c0a2..1d96d19e3 100755
--- a/maxscale-system-test/cnf/maxscale.cnf.template.replication
+++ b/maxscale-system-test/cnf/maxscale.cnf.template.replication
@@ -87,4 +87,3 @@ type=server
 address=###node_server_IP_4###
 port=###node_server_port_4###
 protocol=MySQLBackend
-