Update Galera configurations with 2.1 options

The root_node_as_master option needs to be disabled for 2.1 testing.
2017-06-02 16:41:42 +03:00
parent 1e52191bdf
commit 2e15c3b204
15 changed files with 15 additions and 15 deletions
--- a/maxscale-system-test/cnf/maxscale.cnf.template.check_backend
+++ b/maxscale-system-test/cnf/maxscale.cnf.template.check_backend
@ -18,7 +18,7 @@ servers=gserver1,gserver2,gserver3,gserver4
 user=maxskysql
 passwd=skysql
 monitor_interval=1000
-#root_node_as_master=false
+root_node_as_master=false

 [RW Split Router]
 type=service
--- a/maxscale-system-test/cnf/maxscale.cnf.template.galera
+++ b/maxscale-system-test/cnf/maxscale.cnf.template.galera
@ -8,7 +8,7 @@ servers=server1,server2,server3,server4
 user=maxskysql
 passwd=skysql
 monitor_interval=1000
-#root_node_as_master=false
+root_node_as_master=false

 [RW Split Router]
 type=service
--- a/maxscale-system-test/cnf/maxscale.cnf.template.galera.bug681
+++ b/maxscale-system-test/cnf/maxscale.cnf.template.galera.bug681
@ -10,7 +10,7 @@ servers=server1,server2,server3
 #passwd=maxpwd
 user=maxskysql
 passwd=skysql
-#root_node_as_master=false
+root_node_as_master=false

 [RW Split Router]
 type=service
--- a/maxscale-system-test/cnf/maxscale.cnf.template.galera.weight
+++ b/maxscale-system-test/cnf/maxscale.cnf.template.galera.weight
@ -9,7 +9,7 @@ servers=server1,server2,server3,server4
 user=maxskysql
 passwd=skysql
 use_priority=true
-#root_node_as_master=false
+root_node_as_master=false

 [RW Split Router]
 type=service
--- a/maxscale-system-test/cnf/maxscale.cnf.template.galera_mxs564
+++ b/maxscale-system-test/cnf/maxscale.cnf.template.galera_mxs564
@ -8,7 +8,7 @@ module=galeramon
 servers=server1,server2,server3,server4
 user=maxskysql
 passwd=skysql
-#root_node_as_master=false
+root_node_as_master=false

 [RW Split Router]
 type=service
--- a/maxscale-system-test/cnf/maxscale.cnf.template.galera_priority
+++ b/maxscale-system-test/cnf/maxscale.cnf.template.galera_priority
@ -12,7 +12,7 @@ user=maxskysql
 passwd=skysql
 use_priority=true
 monitor_interval=1000
-#root_node_as_master=false
+root_node_as_master=false

 [RW Split Router]
 type=service
--- a/maxscale-system-test/cnf/maxscale.cnf.template.java_prep_stmt
+++ b/maxscale-system-test/cnf/maxscale.cnf.template.java_prep_stmt
@ -10,7 +10,7 @@ servers= server1, server2,server3  ,server4
 user=maxskysql
 passwd= skysql
 monitor_interval=1000
-#root_node_as_master=false
+root_node_as_master=false

 [RW Split Router]
 type=service
--- a/maxscale-system-test/cnf/maxscale.cnf.template.load_galera
+++ b/maxscale-system-test/cnf/maxscale.cnf.template.load_galera
@ -8,7 +8,7 @@ module=galeramon
 servers=server1,server2,server3,server4
 user=maxskysql
 passwd=skysql
-#root_node_as_master=false
+root_node_as_master=false

 [RW Split Router]
 type=service
--- a/maxscale-system-test/cnf/maxscale.cnf.template.load_galera_pers1
+++ b/maxscale-system-test/cnf/maxscale.cnf.template.load_galera_pers1
@ -8,7 +8,7 @@ module=galeramon
 servers=server1,server2,server3,server4
 user=maxskysql
 passwd=skysql
-#root_node_as_master=false
+root_node_as_master=false

 [RW Split Router]
 type=service
--- a/maxscale-system-test/cnf/maxscale.cnf.template.load_galera_pers10
+++ b/maxscale-system-test/cnf/maxscale.cnf.template.load_galera_pers10
@ -8,7 +8,7 @@ module=galeramon
 servers=server1,server2,server3,server4
 user=maxskysql
 passwd=skysql
-#root_node_as_master=false
+root_node_as_master=false

 [RW Split Router]
 type=service
--- a/maxscale-system-test/cnf/maxscale.cnf.template.mxs118
+++ b/maxscale-system-test/cnf/maxscale.cnf.template.mxs118
@ -16,7 +16,7 @@ module=galeramon
 servers= server1, server2,server3  ,server4
 user=maxskysql
 passwd= skysql
-#root_node_as_master=false
+root_node_as_master=false

 [RW Split Router]
 type=service
--- a/maxscale-system-test/cnf/maxscale.cnf.template.mxs361
+++ b/maxscale-system-test/cnf/maxscale.cnf.template.mxs361
@ -86,7 +86,7 @@ servers=gserver1,gserver2,gserver3,gserver4
 user=maxskysql
 passwd=skysql
 monitor_interval=100
-#root_node_as_master=false
+root_node_as_master=false

 [server1]
 type=server
--- a/maxscale-system-test/cnf/maxscale.cnf.template.pers_01
+++ b/maxscale-system-test/cnf/maxscale.cnf.template.pers_01
@ -86,7 +86,7 @@ servers=gserver1,gserver2,gserver3,gserver4
 user=maxskysql
 passwd=skysql
 monitor_interval=100
-#root_node_as_master=false
+root_node_as_master=false

 [server1]
 type=server
--- a/maxscale-system-test/cnf/maxscale.cnf.template.script
+++ b/maxscale-system-test/cnf/maxscale.cnf.template.script
@ -20,7 +20,7 @@ servers=gserver1,gserver2,gserver3,gserver4
 script=/###access_homedir###/script/script.sh  --event=$EVENT --initiator=$INITIATOR --nodelist=$NODELIST
 events=master_down,master_up, slave_up,   server_down  ,server_up,lost_master,lost_slave,new_master,new_slave,server_down,server_up,synced_down,synced_up
 disable_master_role_setting=true
-#root_node_as_master=false
+root_node_as_master=false
 user=maxskysql
 passwd=skysql
 monitor_interval=1000
--- a/maxscale-system-test/cnf/maxscale.cnf.template.ssl_load_galera
+++ b/maxscale-system-test/cnf/maxscale.cnf.template.ssl_load_galera
@ -8,7 +8,7 @@ module=galeramon
 servers=server1,server2,server3,server4
 user=maxskysql
 passwd=skysql
-#root_node_as_master=false
+root_node_as_master=false

 [RW Split Router]
 type=service