diff --git a/maxscale-system-test/cnf/maxscale.cnf.template.add_server b/maxscale-system-test/cnf/maxscale.cnf.template.add_server index 0044a88fa..5eea68f9c 100644 --- a/maxscale-system-test/cnf/maxscale.cnf.template.add_server +++ b/maxscale-system-test/cnf/maxscale.cnf.template.add_server @@ -7,7 +7,7 @@ type=monitor module=mysqlmon servers= server1,server2,server3,server4 user=maxskysql -passwd= skysql +password= skysql [CLI] type=service @@ -24,7 +24,7 @@ type=service router= readwritesplit servers=server1,server2,server3,server4 user=maxskysql -passwd=skysql +password=skysql router_options=slave_selection_criteria=LEAST_ROUTER_CONNECTIONS [RW Split Listener] diff --git a/maxscale-system-test/cnf/maxscale.cnf.template.add_service b/maxscale-system-test/cnf/maxscale.cnf.template.add_service index be2369f70..fb36c16d2 100644 --- a/maxscale-system-test/cnf/maxscale.cnf.template.add_service +++ b/maxscale-system-test/cnf/maxscale.cnf.template.add_service @@ -7,7 +7,7 @@ type=monitor module=mysqlmon servers= server1,server2,server3,server4 user=maxskysql -passwd= skysql +password= skysql [CLI] type=service @@ -24,7 +24,7 @@ type=service router= readwritesplit servers=server1,server2,server3,server4 user=maxskysql -passwd=skysql +password=skysql router_options=slave_selection_criteria=LEAST_ROUTER_CONNECTIONS [RW Split Listener] @@ -39,7 +39,7 @@ router=readconnroute router_options=master servers=server1,server2,server3,server4 user=maxskysql -passwd=skysql +password=skysql [Read Connection Listener Master] type=listener diff --git a/maxscale-system-test/cnf/maxscale.cnf.template.alter_router b/maxscale-system-test/cnf/maxscale.cnf.template.alter_router index a105f96e0..1a117447f 100755 --- a/maxscale-system-test/cnf/maxscale.cnf.template.alter_router +++ b/maxscale-system-test/cnf/maxscale.cnf.template.alter_router @@ -6,7 +6,7 @@ type=monitor module=mysqlmon servers=server1,server2,server3,server4 user=maxskysql -passwd=skysql +password=skysql monitor_interval=1000 detect_stale_master=false detect_standalone_master=false @@ -16,7 +16,7 @@ type=service router=readwritesplit servers=server1,server2,server3,server4 user=maxskysql -passwd=skysql +password=skysql router_options=slave_selection_criteria=LEAST_GLOBAL_CONNECTIONS max_slave_connections=1 @@ -26,14 +26,14 @@ router=readconnroute router_options=master servers=server1,server2,server3,server4 user=maxskysql -passwd=skysql +password=skysql [SchemaRouter] type=service router=schemarouter servers=server1,server2,server3,server4 user=maxskysql -passwd=skysql +password=skysql [RW-Split-Listener] type=listener diff --git a/maxscale-system-test/cnf/maxscale.cnf.template.auroramon b/maxscale-system-test/cnf/maxscale.cnf.template.auroramon index e31f369f1..9a9695f04 100644 --- a/maxscale-system-test/cnf/maxscale.cnf.template.auroramon +++ b/maxscale-system-test/cnf/maxscale.cnf.template.auroramon @@ -9,7 +9,7 @@ type=monitor module=auroramon servers=server1,server2,server3,server4 user=skysql -passwd=skysqlrds +password=skysqlrds monitor_interval=1000 # Services @@ -19,7 +19,7 @@ type=service router=readwritesplit servers=server1,server2,server3,server4 user=skysql -passwd=skysqlrds +password=skysqlrds [CLI] type=service diff --git a/maxscale-system-test/cnf/maxscale.cnf.template.avro b/maxscale-system-test/cnf/maxscale.cnf.template.avro index 2404559af..81805c766 100755 --- a/maxscale-system-test/cnf/maxscale.cnf.template.avro +++ b/maxscale-system-test/cnf/maxscale.cnf.template.avro @@ -10,7 +10,7 @@ type=service router=binlogrouter #servers=master user=skysql -passwd=skysql +password=skysql version_string=5.6.15-log #router_options=server-id=3,user=repl,password=repl,master-id=1 router_options=server-id=3,user=repl,password=repl,longburst=500,heartbeat=30,binlogdir=/var/lib/maxscale/Binlog_Service,mariadb10-compatibility=1 @@ -51,7 +51,7 @@ group_trx=1 group_rows=1 avrodir=/var/lib/maxscale/avro/ user=skysql -passwd=skysql +password=skysql [avro-listener] type=listener diff --git a/maxscale-system-test/cnf/maxscale.cnf.template.avro_compression b/maxscale-system-test/cnf/maxscale.cnf.template.avro_compression index ca9f3ce99..b7e25f4f6 100644 --- a/maxscale-system-test/cnf/maxscale.cnf.template.avro_compression +++ b/maxscale-system-test/cnf/maxscale.cnf.template.avro_compression @@ -7,7 +7,7 @@ log_info=1 type=service router=binlogrouter user=skysql -passwd=skysql +password=skysql version_string=5.6.15-log router_options=server-id=3,user=repl,password=repl,longburst=500,heartbeat=30,binlogdir=/var/lib/maxscale/Binlog_Service,mariadb10-compatibility=1 @@ -38,7 +38,7 @@ group_trx=1 group_rows=1 avrodir=/var/lib/maxscale/avro/ user=skysql -passwd=skysql +password=skysql [avro-listener] type=listener diff --git a/maxscale-system-test/cnf/maxscale.cnf.template.bad_pers b/maxscale-system-test/cnf/maxscale.cnf.template.bad_pers index 40e7c880c..f61afb078 100755 --- a/maxscale-system-test/cnf/maxscale.cnf.template.bad_pers +++ b/maxscale-system-test/cnf/maxscale.cnf.template.bad_pers @@ -7,7 +7,7 @@ type=monitor module=mysqlmon servers= server1, server2,server3 ,server4 user=maxskysql -passwd= skysql +password= skysql monitor_interval=1000 [RW Split Router] @@ -15,7 +15,7 @@ type=service router= readwritesplit servers=server1, server2, server3,server4 user=maxskysql -passwd=skysql +password=skysql router_options=slave_selection_criteria=LEAST_ROUTER_CONNECTIONS max_slave_connections=1 @@ -25,7 +25,7 @@ router=readconnroute router_options= slave servers=server1,server2,server3,server4 user=maxskysql -passwd=skysql +password=skysql [Read Connection Router Master] type=service @@ -33,7 +33,7 @@ router=readconnroute router_options=master servers=server1,server2,server3,server4 user=maxskysql -passwd=skysql +password=skysql [RW Split Listener] type=listener diff --git a/maxscale-system-test/cnf/maxscale.cnf.template.bad_ssl b/maxscale-system-test/cnf/maxscale.cnf.template.bad_ssl index e759649ce..0b050ace3 100755 --- a/maxscale-system-test/cnf/maxscale.cnf.template.bad_ssl +++ b/maxscale-system-test/cnf/maxscale.cnf.template.bad_ssl @@ -7,14 +7,14 @@ type=monitor module=mysqlmon servers= server1, server2,server3 ,server4 user=maxskysql -passwd= skysql +password= skysql [RW Split Router] type=service router= readwritesplit servers=server1,server2,server3,server4 user=maxskysql -passwd=skysql +password=skysql max_slave_connections=100% router_options=slave_selection_criteria=LEAST_CURRENT_OPERATIONS ssl=required @@ -30,7 +30,7 @@ router=readconnroute router_options= slave servers=server1,server2,server3,server4 user=maxskysql -passwd=skysql +password=skysql ssl=required ssl_cert=/###access_homedir###/certs/server-cert.pem ssl_key=/###access_homedir###/certs/server-key.pem @@ -43,7 +43,7 @@ router=readconnroute router_options=master servers=server1,server2,server3,server4 user=maxskysql -passwd=skysql +password=skysql ssl=required ssl_cert=/###access_homedir###/certs/server-cert.pem ssl_key=/###access_homedir###/certs/server-key.pem diff --git a/maxscale-system-test/cnf/maxscale.cnf.template.batchinsert b/maxscale-system-test/cnf/maxscale.cnf.template.batchinsert index 8175d2e71..763a42922 100644 --- a/maxscale-system-test/cnf/maxscale.cnf.template.batchinsert +++ b/maxscale-system-test/cnf/maxscale.cnf.template.batchinsert @@ -6,7 +6,7 @@ type=monitor module=mysqlmon servers=server1,server2,server3,server4 user=maxskysql -passwd=skysql +password=skysql monitor_interval=1000 [RW Split Router] @@ -14,7 +14,7 @@ type=service router=readwritesplit servers=server1,server2,server3,server4 user=maxskysql -passwd=skysql +password=skysql router_options=slave_selection_criteria=LEAST_GLOBAL_CONNECTIONS max_slave_connections=1 @@ -24,7 +24,7 @@ router=readconnroute router_options=slave servers=server1,server2,server3,server4 user=maxskysql -passwd=skysql +password=skysql [Read Connection Router Master] type=service @@ -32,7 +32,7 @@ router=readconnroute router_options=master servers=server1,server2,server3,server4 user=maxskysql -passwd=skysql +password=skysql [RW Split Listener] type=listener diff --git a/maxscale-system-test/cnf/maxscale.cnf.template.binlog_enc_aes_cbc b/maxscale-system-test/cnf/maxscale.cnf.template.binlog_enc_aes_cbc index e4259fad6..9d831854a 100755 --- a/maxscale-system-test/cnf/maxscale.cnf.template.binlog_enc_aes_cbc +++ b/maxscale-system-test/cnf/maxscale.cnf.template.binlog_enc_aes_cbc @@ -6,7 +6,7 @@ log_warning=1 type=service router=binlogrouter user=skysql -passwd=skysql +password=skysql version_string=5.6.15-log #router_options=server-id=3,user=repl,password=repl,master-id=1 router_options=server-id=3,user=repl,password=repl,longburst=500,heartbeat=30,binlogdir=/var/lib/maxscale/Binlog_Service,mariadb10-compatibility=1,encrypt_binlog=1,encryption_key_file=/etc/mariadb_binlog_keys.txt,encryption_algorithm=aes_cbc diff --git a/maxscale-system-test/cnf/maxscale.cnf.template.binlog_enc_aes_ctr b/maxscale-system-test/cnf/maxscale.cnf.template.binlog_enc_aes_ctr index 265a5e751..c022c1497 100755 --- a/maxscale-system-test/cnf/maxscale.cnf.template.binlog_enc_aes_ctr +++ b/maxscale-system-test/cnf/maxscale.cnf.template.binlog_enc_aes_ctr @@ -6,7 +6,7 @@ log_warning=1 type=service router=binlogrouter user=skysql -passwd=skysql +password=skysql version_string=5.6.15-log #router_options=server-id=3,user=repl,password=repl,master-id=1 router_options=server-id=3,user=repl,password=repl,longburst=500,heartbeat=30,binlogdir=/var/lib/maxscale/Binlog_Service,mariadb10-compatibility=1,encrypt_binlog=1,encryption_key_file=/etc/mariadb_binlog_keys.txt,encryption_algorithm=aes_ctr diff --git a/maxscale-system-test/cnf/maxscale.cnf.template.binlog_incompl b/maxscale-system-test/cnf/maxscale.cnf.template.binlog_incompl index 40f9d0dbd..ffe051635 100755 --- a/maxscale-system-test/cnf/maxscale.cnf.template.binlog_incompl +++ b/maxscale-system-test/cnf/maxscale.cnf.template.binlog_incompl @@ -7,7 +7,7 @@ type=service router=binlogrouter #servers=master user=repl -passwd=repl +password=repl version_string=5.6.15-log diff --git a/maxscale-system-test/cnf/maxscale.cnf.template.bug359 b/maxscale-system-test/cnf/maxscale.cnf.template.bug359 index 0898a39bd..6cb3b569d 100755 --- a/maxscale-system-test/cnf/maxscale.cnf.template.bug359 +++ b/maxscale-system-test/cnf/maxscale.cnf.template.bug359 @@ -7,7 +7,7 @@ type=monitor module=mysqlmon servers= server1, server2,server3 ,server4 user=maxskysql -passwd= skysql +password= skysql [RW Split Router] type=service @@ -15,7 +15,7 @@ router= readwritesplit router_options=slave servers=server1, server2, server3,server4 user=maxskysql -passwd=skysql +password=skysql [Read Connection Router Slave] type=service @@ -23,7 +23,7 @@ router=readconnroute router_options= slave servers=server1,server2,server3,server4 user=maxskysql -passwd=skysql +password=skysql [Read Connection Router Master] type=service @@ -31,7 +31,7 @@ router=readconnroute router_options=master servers=server1,server2,server3,server4 user=maxskysql -passwd=skysql +password=skysql [RW Split Listener] type=listener diff --git a/maxscale-system-test/cnf/maxscale.cnf.template.bug471 b/maxscale-system-test/cnf/maxscale.cnf.template.bug471 index 99b3b3958..4d04fec1b 100755 --- a/maxscale-system-test/cnf/maxscale.cnf.template.bug471 +++ b/maxscale-system-test/cnf/maxscale.cnf.template.bug471 @@ -7,7 +7,7 @@ type=monitor module=mysqlmon servers= server1,server3 ,server4 user=maxskysql -passwd= skysql +password= skysql [hints] type=filter @@ -24,7 +24,7 @@ type=service router= readwritesplit servers=server1, server2, server3,server4 user=maxskysql -passwd=skysql +password=skysql max_slave_connections=100% use_sql_variables_in=all router_options=slave_selection_criteria=LEAST_BEHIND_MASTER @@ -37,7 +37,7 @@ router=readconnroute router_options= slave servers=server1,server2,server3,server4 user=maxskysql -passwd=skysql +password=skysql [Read Connection Router Master] type=service @@ -45,7 +45,7 @@ router=readconnroute router_options=master servers=server1,server2,server3,server4 user=maxskysql -passwd=skysql +password=skysql [RW Split Listener] type=listener diff --git a/maxscale-system-test/cnf/maxscale.cnf.template.bug479 b/maxscale-system-test/cnf/maxscale.cnf.template.bug479 index 7a11a1b49..1e90ab770 100755 --- a/maxscale-system-test/cnf/maxscale.cnf.template.bug479 +++ b/maxscale-system-test/cnf/maxscale.cnf.template.bug479 @@ -7,14 +7,14 @@ type=monitor module=mysqlmon servers= server1, server2,server3 ,server4 user=maxskysql -passwd= skysql +password= skysql [RW Split Router] type=service router= readwritesplit servers=server1, server2, server3,server4 user=maxskysql -passwd=skysql +password=skysql filters=non existing filter | не существуюший фильтер [Read Connection Router Slave] @@ -23,7 +23,7 @@ router=readconnroute router_options= slave servers=server1,server2,server3,server4 user=maxskysql -passwd=skysql +password=skysql [Read Connection Router Master] type=service @@ -31,7 +31,7 @@ router=readconnroute router_options=master servers=server1,server2,server3,server4 user=maxskysql -passwd=skysql +password=skysql [RW Split Listener] type=listener diff --git a/maxscale-system-test/cnf/maxscale.cnf.template.bug493 b/maxscale-system-test/cnf/maxscale.cnf.template.bug493 index 2b78972c9..5e59e6de6 100755 --- a/maxscale-system-test/cnf/maxscale.cnf.template.bug493 +++ b/maxscale-system-test/cnf/maxscale.cnf.template.bug493 @@ -7,14 +7,14 @@ type=monitor module=mysqlmon servers= server1, server2,server3 ,server4 user=maxskysql -passwd= skysql +password= skysql [RW Split Router] type=service router= readwritesplit servers=server1, server2, server3,server4 user=maxskysql -passwd=skysql +password=skysql [Read Connection Router Slave] type=service @@ -22,7 +22,7 @@ router=readconnroute router_options= slave servers=server1,server2,server3,server4 user=maxskysql -passwd=skysql +password=skysql [Read Connection Router Master] type=service @@ -30,7 +30,7 @@ router=readconnroute router_options=master servers=server1,server2,server3,server4 user=maxskysql -passwd=skysql +password=skysql [RW Split Listener] type=listener diff --git a/maxscale-system-test/cnf/maxscale.cnf.template.bug495 b/maxscale-system-test/cnf/maxscale.cnf.template.bug495 index 87b12b72c..308ae3159 100755 --- a/maxscale-system-test/cnf/maxscale.cnf.template.bug495 +++ b/maxscale-system-test/cnf/maxscale.cnf.template.bug495 @@ -7,14 +7,14 @@ type=monitor module=mysqlmon servers= server1, server2,server3 ,server4,server5 user=maxskysql -passwd= skysql +password= skysql [RW Split Router] type=service router= readwritesplit servers=server1, server2, server3,server4 user=maxskysql -passwd=skysql +password=skysql [Read Connection Router Slave] type=service @@ -22,7 +22,7 @@ router=readconnroute router_options= slave servers=server1,server2,server3,server4 user=maxskysql -passwd=skysql +password=skysql [Read Connection Router Master] type=service @@ -30,7 +30,7 @@ router=readconnroute router_options=master servers=server1,server2,server3,server4 user=maxskysql -passwd=skysql +password=skysql [RW Split Listener] type=listener diff --git a/maxscale-system-test/cnf/maxscale.cnf.template.bug526 b/maxscale-system-test/cnf/maxscale.cnf.template.bug526 index 007697c5a..55174315b 100755 --- a/maxscale-system-test/cnf/maxscale.cnf.template.bug526 +++ b/maxscale-system-test/cnf/maxscale.cnf.template.bug526 @@ -7,14 +7,14 @@ type=monitor module=mysqlmon servers= server1, server2,server3 ,server4 user=maxskysql -passwd= skysql +password= skysql [RW Split Router] type=service router= readwritesplit servers=server1, server2, server3,server4 user=maxskysql -passwd=skysql +password=skysql filters=testfilter [Read Connection Router Slave] @@ -23,7 +23,7 @@ router=readconnroute router_options= slave servers=server1,server2,server3,server4 user=maxskysql -passwd=skysql +password=skysql [Read Connection Router Master] type=service @@ -31,7 +31,7 @@ router=readconnroute router_options=master servers=server1,server2,server3,server4 user=maxskysql -passwd=skysql +password=skysql [RW Split Listener] type=listener diff --git a/maxscale-system-test/cnf/maxscale.cnf.template.bug539 b/maxscale-system-test/cnf/maxscale.cnf.template.bug539 index a2d0f2960..2a2367b39 100755 --- a/maxscale-system-test/cnf/maxscale.cnf.template.bug539 +++ b/maxscale-system-test/cnf/maxscale.cnf.template.bug539 @@ -8,7 +8,7 @@ module=mysqlmon detect_replication_lag=1 servers=server1,server2,server3,server4 user=maxuser -passwd=maxpwd +password=maxpwd [hints] type=filter @@ -23,7 +23,7 @@ max_slave_connections=100% use_sql_variables_in=master router_options=slave_selection_criteria=LEAST_BEHIND_MASTER user=maxskysql -passwd=skysql +password=skysql filters=hints [Read Connection Router Slave] @@ -32,7 +32,7 @@ router=readconnroute router_options= slave servers=server1,server2,server3,server4 user=maxskysql -passwd=skysql +password=skysql [Read Connection Router Master] type=service @@ -40,7 +40,7 @@ router=readconnroute router_options=master servers=server1,server2,server3,server4 user=maxskysql -passwd=skysql +password=skysql [RW Split Listener] type=listener diff --git a/maxscale-system-test/cnf/maxscale.cnf.template.bug547 b/maxscale-system-test/cnf/maxscale.cnf.template.bug547 index d7ad56025..4cfdccedb 100755 --- a/maxscale-system-test/cnf/maxscale.cnf.template.bug547 +++ b/maxscale-system-test/cnf/maxscale.cnf.template.bug547 @@ -7,14 +7,14 @@ type=monitor module=mysqlmon servers= server1, server2,server3 ,server4 user=maxskysql -passwd= skysql +password= skysql [RW Split Router] type=service router= readwritesplit servers=server1, server2, server3,server4 user=maxskysql -passwd=skysql +password=skysql [Read Connection Router Slave] type=service @@ -22,7 +22,7 @@ router=readconnroute router_options= slave servers=server1,server2,server3,server4 user=maxskysql -passwd=skysql +password=skysql [Read Connection Router Master] type=service @@ -30,7 +30,7 @@ router=readconnroute router_options=master servers=server1,server2,server3,server4 user=maxskysql -passwd=skysql +password=skysql [RW Split Listener] type=listener diff --git a/maxscale-system-test/cnf/maxscale.cnf.template.bug567 b/maxscale-system-test/cnf/maxscale.cnf.template.bug567 index 1fd15146a..8a73f0de7 100755 --- a/maxscale-system-test/cnf/maxscale.cnf.template.bug567 +++ b/maxscale-system-test/cnf/maxscale.cnf.template.bug567 @@ -9,7 +9,7 @@ type=monitor module=mysqlmon servers= server1, server2,server3 ,server4 user=maxskysql -passwd= skysql +password= skysql monitor_interval=1000 detect_stale_master=false @@ -18,7 +18,7 @@ type=service router= readwritesplit servers=server1, server2, server3,server4 user=maxskysql -passwd=skysql +password=skysql router_options=slave_selection_criteria=LEAST_GLOBAL_CONNECTIONS max_slave_connections=1 @@ -28,7 +28,7 @@ router=readconnroute router_options= slave servers=server1,server2,server3,server4 user=maxskysql -passwd=skysql +password=skysql [Read Connection Router Master] type=service @@ -36,7 +36,7 @@ router=readconnroute router_options=master servers=server1,server2,server3,server4 user=maxskysql -passwd=skysql +password=skysql [RW Split Listener] type=listener diff --git a/maxscale-system-test/cnf/maxscale.cnf.template.bug571 b/maxscale-system-test/cnf/maxscale.cnf.template.bug571 index 81d3670b1..a88c8d2ba 100755 --- a/maxscale-system-test/cnf/maxscale.cnf.template.bug571 +++ b/maxscale-system-test/cnf/maxscale.cnf.template.bug571 @@ -7,7 +7,7 @@ type=monitor module=mysqlmon servers= server1, server2,server3 ,server4 user=maxskysql -passwd= skysql +password= skysql [regex] type=filter @@ -30,7 +30,7 @@ type=service router= readwritesplit servers=server1, server2, server3,server4 user=maxskysql -passwd=skysql +password=skysql max_slave_connections=100% use_sql_variables_in=all router_options=slave_selection_criteria=LEAST_BEHIND_MASTER @@ -43,7 +43,7 @@ router=readconnroute router_options= slave servers=server1,server2,server3,server4 user=maxskysql -passwd=skysql +password=skysql [Read Connection Router Master] type=service @@ -51,7 +51,7 @@ router=readconnroute router_options=master servers=server1,server2,server3,server4 user=maxskysql -passwd=skysql +password=skysql [RW Split Listener] type=listener diff --git a/maxscale-system-test/cnf/maxscale.cnf.template.bug585 b/maxscale-system-test/cnf/maxscale.cnf.template.bug585 index 1ac9b1e12..068584dde 100755 --- a/maxscale-system-test/cnf/maxscale.cnf.template.bug585 +++ b/maxscale-system-test/cnf/maxscale.cnf.template.bug585 @@ -7,7 +7,7 @@ type=monitor module=mysqlmon servers= server1, server2,server3 ,server4 user=maxskysql -passwd= skysql +password= skysql [regex] type=filter @@ -26,7 +26,7 @@ type=service router= readwritesplit servers=server1, server2, server3,server4 user=maxskysql -passwd=skysql +password=skysql max_slave_connections=100% use_sql_variables_in=all router_options=slave_selection_criteria=LEAST_BEHIND_MASTER @@ -42,7 +42,7 @@ router=readconnroute router_options= slave servers=server1,server2,server3,server4 user=maxskysql -passwd=skysql +password=skysql [Read Connection Router Master] type=service @@ -50,7 +50,7 @@ router=readconnroute router_options=master servers=server1,server2,server3,server4 user=maxskysql -passwd=skysql +password=skysql [RW Split Listener] type=listener diff --git a/maxscale-system-test/cnf/maxscale.cnf.template.bug587 b/maxscale-system-test/cnf/maxscale.cnf.template.bug587 index 836767f0d..c3e245915 100755 --- a/maxscale-system-test/cnf/maxscale.cnf.template.bug587 +++ b/maxscale-system-test/cnf/maxscale.cnf.template.bug587 @@ -7,7 +7,7 @@ type=monitor module=mysqlmon servers= server1, server2,server3 ,server4 user=maxskysql -passwd= skysql +password= skysql [hints] type=filter @@ -24,7 +24,7 @@ type=service router= readwritesplit servers=server1, server2, server3,server4 user=maxskysql -passwd=skysql +password=skysql max_slave_connections=100% use_sql_variables_in=all router_options=slave_selection_criteria=LEAST_BEHIND_MASTER @@ -36,7 +36,7 @@ router=readconnroute router_options= slave servers=server1,server2,server3,server4 user=maxskysql -passwd=skysql +password=skysql [Read Connection Router Master] type=service @@ -44,7 +44,7 @@ router=readconnroute router_options=master servers=server1,server2,server3,server4 user=maxskysql -passwd=skysql +password=skysql [RW Split Listener] type=listener diff --git a/maxscale-system-test/cnf/maxscale.cnf.template.bug587_1 b/maxscale-system-test/cnf/maxscale.cnf.template.bug587_1 index 01531a237..e41ca7fb3 100755 --- a/maxscale-system-test/cnf/maxscale.cnf.template.bug587_1 +++ b/maxscale-system-test/cnf/maxscale.cnf.template.bug587_1 @@ -7,7 +7,7 @@ type=monitor module=mysqlmon servers= server1, server2,server3 ,server4 user=maxskysql -passwd= skysql +password= skysql [hints] type=filter @@ -24,7 +24,7 @@ type=service router= readwritesplit servers=server1, server2, server3,server4 user=maxskysql -passwd=skysql +password=skysql max_slave_connections=100% use_sql_variables_in=all router_options=slave_selection_criteria=LEAST_BEHIND_MASTER @@ -36,7 +36,7 @@ router=readconnroute router_options= slave servers=server1,server2,server3,server4 user=maxskysql -passwd=skysql +password=skysql [Read Connection Router Master] type=service @@ -44,7 +44,7 @@ router=readconnroute router_options=master servers=server1,server2,server3,server4 user=maxskysql -passwd=skysql +password=skysql [RW Split Listener] type=listener diff --git a/maxscale-system-test/cnf/maxscale.cnf.template.bug601 b/maxscale-system-test/cnf/maxscale.cnf.template.bug601 index 085bcf817..893d19603 100755 --- a/maxscale-system-test/cnf/maxscale.cnf.template.bug601 +++ b/maxscale-system-test/cnf/maxscale.cnf.template.bug601 @@ -7,14 +7,14 @@ type=monitor module=mysqlmon servers= server1, server2,server3 ,server4 user=maxskysql -passwd= skysql +password= skysql [RW Split Router] type=service router= readwritesplit servers=server1, server2, server3,server4 user=maxskysql -passwd=skysql +password=skysql [Read Connection Router Slave] type=service @@ -22,7 +22,7 @@ router=readconnroute router_options= slave servers=server1,server2,server3,server4 user=maxskysql -passwd=skysql +password=skysql [Read Connection Router Master] type=service @@ -30,7 +30,7 @@ router=readconnroute router_options=master servers=server1,server2,server3,server4 user=maxskysql -passwd=skysql +password=skysql [RW Split Listener] type=listener diff --git a/maxscale-system-test/cnf/maxscale.cnf.template.bug620 b/maxscale-system-test/cnf/maxscale.cnf.template.bug620 index a30e3bbbb..f08bf34ef 100755 --- a/maxscale-system-test/cnf/maxscale.cnf.template.bug620 +++ b/maxscale-system-test/cnf/maxscale.cnf.template.bug620 @@ -7,14 +7,14 @@ type=monitor module=mysqlmon servers= server1, server2,server3 ,server4 user=maxskysql -passwd= skysql +password= skysql [RW Split Router] type=service router= readwritesplit servers=server1, server2, server3,server4 user=maxskysql -passwd=skysql +password=skysql enable_root_user=true [Read Connection Router Slave] @@ -23,7 +23,7 @@ router=readconnroute router_options= slave servers=server1,server2,server3,server4 user=maxskysql -passwd=skysql +password=skysql [Read Connection Router Master] type=service @@ -31,7 +31,7 @@ router=readconnroute router_options=master servers=server1,server2,server3,server4 user=maxskysql -passwd=skysql +password=skysql [RW Split Listener] type=listener diff --git a/maxscale-system-test/cnf/maxscale.cnf.template.bug643 b/maxscale-system-test/cnf/maxscale.cnf.template.bug643 index c69d83745..d32bdb58b 100755 --- a/maxscale-system-test/cnf/maxscale.cnf.template.bug643 +++ b/maxscale-system-test/cnf/maxscale.cnf.template.bug643 @@ -7,7 +7,7 @@ type=monitor module=mysqlmon servers= server1, server2,server3 ,server4 user=maxskysql -passwd= skysql +password= skysql [RW Split Router] type=service @@ -16,7 +16,7 @@ servers=server1,server2,server3,server4 max_slave_connections=100% use_sql_variables_in=all user=maxskysql -passwd=skysql +password=skysql filters=duplicate [duplicate] @@ -31,7 +31,7 @@ router=readconnroute router_options= slave servers=server1,server2,server3,server4 user=maxskysql -passwd=skysql +password=skysql [Read Connection Router Master] type=service @@ -39,7 +39,7 @@ router=readconnroute router_options=master servers=server1,server2,server3,server4 user=maxskysql -passwd=skysql +password=skysql [RW Split Listener] type=listener diff --git a/maxscale-system-test/cnf/maxscale.cnf.template.bug643_1 b/maxscale-system-test/cnf/maxscale.cnf.template.bug643_1 index 8ca134226..fd764170e 100755 --- a/maxscale-system-test/cnf/maxscale.cnf.template.bug643_1 +++ b/maxscale-system-test/cnf/maxscale.cnf.template.bug643_1 @@ -10,7 +10,7 @@ servers=server1,server2,server3,server4 detect_replication_lag=1 detect_stale_master=1 user=maxskysql -passwd= skysql +password= skysql [hints] type=filter @@ -52,7 +52,7 @@ max_slave_connections=100% use_sql_variables_in=all #use_sql_variables_in=master user=maxskysql -passwd=skysql +password=skysql #filters=typo|qla|regex|hints|regex|hints #enable_root_user=1 filters=duplicate @@ -64,7 +64,7 @@ servers=server1,server2,server3,server4 max_slave_connections=100% use_sql_variables_in=all user=maxskysql -passwd=skysql +password=skysql filters=qla|tests|hints @@ -74,7 +74,7 @@ router=readconnroute router_options= slave servers=server1,server2,server3,server4 user=maxskysql -passwd=skysql +password=skysql [Read Connection Router Master] type=service @@ -82,7 +82,7 @@ router=readconnroute router_options=master servers=server1,server2,server3,server4 user=maxskysql -passwd=skysql +password=skysql [RW Split Listener] type=listener diff --git a/maxscale-system-test/cnf/maxscale.cnf.template.bug645 b/maxscale-system-test/cnf/maxscale.cnf.template.bug645 index a53989f1f..d6d62bac7 100755 --- a/maxscale-system-test/cnf/maxscale.cnf.template.bug645 +++ b/maxscale-system-test/cnf/maxscale.cnf.template.bug645 @@ -7,14 +7,14 @@ type=monitor module=mysqlmon servers= server1, server2,server3 ,server4 user=maxskysql -passwd= skysql +password= skysql [RW_Router] type=service router=readconnroute servers=server1 user=maxskysql -passwd=skysql +password=skysql version_string=5.1-OLD-Bored-Mysql filters=DuplicaFilter @@ -23,7 +23,7 @@ type=service router=readwritesplit servers=server1,server3,server2 user=maxskysql -passwd=skysql +password=skysql [DuplicaFilter] type=filter @@ -48,7 +48,7 @@ router=readconnroute router_options= slave servers=server1,server2,server3,server4 user=maxskysql -passwd=skysql +password=skysql [Read Connection Router Master] type=service @@ -56,7 +56,7 @@ router=readconnroute router_options=master servers=server1,server2,server3,server4 user=maxskysql -passwd=skysql +password=skysql [Read Connection Listener Slave] type=listener diff --git a/maxscale-system-test/cnf/maxscale.cnf.template.bug645_1 b/maxscale-system-test/cnf/maxscale.cnf.template.bug645_1 index 3cee44f80..693535849 100755 --- a/maxscale-system-test/cnf/maxscale.cnf.template.bug645_1 +++ b/maxscale-system-test/cnf/maxscale.cnf.template.bug645_1 @@ -7,14 +7,14 @@ type=monitor module=mysqlmon servers= server1, server2,server3 ,server4 user=maxskysql -passwd= skysql +password= skysql [RW_Router] type=service router=readconnroute servers=server1 user=maxskysql -passwd=skysql +password=skysql version_string=5.1-OLD-Bored-Mysql filters=DuplicaFilter @@ -23,7 +23,7 @@ type=service router=readwritesplit servers=server3,server2 user=maxskysql -passwd=skysql +password=skysql [DuplicaFilter] type=filter @@ -48,7 +48,7 @@ router=readconnroute router_options= slave servers=server1,server2,server3,server4 user=maxskysql -passwd=skysql +password=skysql [Read Connection Router Master] type=service @@ -56,7 +56,7 @@ router=readconnroute router_options=master servers=server1,server2,server3,server4 user=maxskysql -passwd=skysql +password=skysql [Read Connection Listener Slave] type=listener diff --git a/maxscale-system-test/cnf/maxscale.cnf.template.bug648 b/maxscale-system-test/cnf/maxscale.cnf.template.bug648 index ce6f42988..258b0df88 100755 --- a/maxscale-system-test/cnf/maxscale.cnf.template.bug648 +++ b/maxscale-system-test/cnf/maxscale.cnf.template.bug648 @@ -7,14 +7,14 @@ type=monitor module=mysqlmon servers= server1, server2,server3 ,server4 user=maxskysql -passwd= skysql +password= skysql [RW Split Router] type=service router= readwritesplit servers=server1, server2, server3,server4 user=maxskysql -passwd=skysql +password=skysql #filters=TEE [TEE] @@ -28,7 +28,7 @@ router=readconnroute router_options= slave servers=server1,server2,server3,server4 user=maxskysql -passwd=skysql +password=skysql filters=TEE [Read Connection Router Master] @@ -37,7 +37,7 @@ router=readconnroute router_options=master servers=server1,server2,server3,server4 user=maxskysql -passwd=skysql +password=skysql filters=TEE [RW Split Listener] diff --git a/maxscale-system-test/cnf/maxscale.cnf.template.bug650 b/maxscale-system-test/cnf/maxscale.cnf.template.bug650 index c73a2ee5a..2fe12f6b4 100755 --- a/maxscale-system-test/cnf/maxscale.cnf.template.bug650 +++ b/maxscale-system-test/cnf/maxscale.cnf.template.bug650 @@ -7,14 +7,14 @@ type=monitor module=mysqlmon servers= server1, server2,server3 ,server4 user=maxskysql -passwd= skysql +password= skysql [RW_Router] type=service router=readconnroute servers=server1 user=maxskysql -passwd=skysql +password=skysql version_string=5.1-OLD-Bored-Mysql filters=DuplicaFilter @@ -23,7 +23,7 @@ type=service router=readwritesplit servers=server3,server2 user=maxskysql -passwd=skysql +password=skysql [DuplicaFilter] type=filter @@ -48,7 +48,7 @@ router=readconnroute router_options= slave servers=server1,server2,server3,server4 user=maxskysql -passwd=skysql +password=skysql [Read Connection Router Master] type=service @@ -56,7 +56,7 @@ router=readconnroute router_options=master servers=server1,server2,server3,server4 user=maxskysql -passwd=skysql +password=skysql [Read Connection Listener Slave] type=listener diff --git a/maxscale-system-test/cnf/maxscale.cnf.template.bug657 b/maxscale-system-test/cnf/maxscale.cnf.template.bug657 index 25a6e4142..b409054d8 100755 --- a/maxscale-system-test/cnf/maxscale.cnf.template.bug657 +++ b/maxscale-system-test/cnf/maxscale.cnf.template.bug657 @@ -7,7 +7,7 @@ type=monitor module=mysqlmon servers= server1, server2,server3 ,server4 user=maxskysql -passwd= skysql +password= skysql monitor_interval=1000 [RW Split Router] @@ -15,7 +15,7 @@ type=service router= readwritesplit servers=server1, server2, server3,server4 user=maxskysql -passwd=skysql +password=skysql [Read Connection Router Slave] type=service @@ -23,7 +23,7 @@ router=readconnroute router_options= slave servers=server1,server2,server3,server4 user=maxskysql -passwd=skysql +password=skysql filters=TEE [Read Connection Router Master] @@ -32,7 +32,7 @@ router=readconnroute router_options=master servers=server1,server2,server3,server4 user=maxskysql -passwd=skysql +password=skysql filters=TEE [TEE] diff --git a/maxscale-system-test/cnf/maxscale.cnf.template.bug662 b/maxscale-system-test/cnf/maxscale.cnf.template.bug662 index 0ac985c84..1f14c372e 100644 --- a/maxscale-system-test/cnf/maxscale.cnf.template.bug662 +++ b/maxscale-system-test/cnf/maxscale.cnf.template.bug662 @@ -9,7 +9,7 @@ type=monitor module=mysqlmon servers=server1,server2,server3,server4 user=maxskysql -passwd=skysql +password=skysql monitor_interval=1000 detect_stale_master=false backend_connect_timeout=1 @@ -21,7 +21,7 @@ type=service router=readwritesplit servers=server1,server2,server3,server4 user=maxskysql -passwd=skysql +password=skysql router_options=slave_selection_criteria=LEAST_GLOBAL_CONNECTIONS max_slave_connections=1 @@ -31,7 +31,7 @@ router=readconnroute router_options=slave servers=server1,server2,server3,server4 user=maxskysql -passwd=skysql +password=skysql [Read Connection Router Master] type=service @@ -39,7 +39,7 @@ router=readconnroute router_options=master servers=server1,server2,server3,server4 user=maxskysql -passwd=skysql +password=skysql [RW Split Listener] type=listener diff --git a/maxscale-system-test/cnf/maxscale.cnf.template.bug664 b/maxscale-system-test/cnf/maxscale.cnf.template.bug664 index 7a4a8272b..7ef697b69 100755 --- a/maxscale-system-test/cnf/maxscale.cnf.template.bug664 +++ b/maxscale-system-test/cnf/maxscale.cnf.template.bug664 @@ -7,14 +7,14 @@ type=monitor module=mysqlmon servers= server1, server2,server3 ,server4 user=maxskysql -passwd= skysql +password= skysql [RW_Router] type=service router=readconnroute servers=server1 user=maxskysql -passwd=skysql +password=skysql version_string=5.1-OLD-Bored-Mysql filters=DuplicaFilter @@ -23,7 +23,7 @@ type=service router=readwritesplit servers=server3,server2 user=maxskysql -passwd=skysql +password=skysql [DuplicaFilter] type=filter @@ -48,7 +48,7 @@ router=readconnroute router_options= slave servers=server1,server2,server3,server4 user=maxskysql -passwd=skysql +password=skysql [Read Connection Router Master] type=service @@ -56,7 +56,7 @@ router=readconnroute router_options=master servers=server1,server2,server3,server4 user=maxskysql -passwd=skysql +password=skysql [Read Connection Listener Slave] type=listener diff --git a/maxscale-system-test/cnf/maxscale.cnf.template.bug670 b/maxscale-system-test/cnf/maxscale.cnf.template.bug670 index f76c4b125..fd275d0dc 100755 --- a/maxscale-system-test/cnf/maxscale.cnf.template.bug670 +++ b/maxscale-system-test/cnf/maxscale.cnf.template.bug670 @@ -7,7 +7,7 @@ module=mysqlmon monitor_interval=10000 servers=server1,server2,server3,server4 user=skysql -passwd=skysql +password=skysql [hints] type=filter @@ -44,7 +44,7 @@ max_slave_connections=100% use_sql_variables_in=all user=skysql -passwd=skysql +password=skysql filters=typo|qla|regex|hints|regex|hints enable_root_user=1 @@ -55,7 +55,7 @@ servers=server1,server2 max_slave_connections=100% use_sql_variables_in=all user=skysql -passwd=skysql +password=skysql [Read Connection Router] type=service @@ -63,7 +63,7 @@ router=readconnroute router_options=master servers=server1,server2 user=skysql -passwd=skysql +password=skysql filters=duplicate [CLI] @@ -100,7 +100,7 @@ router=readconnroute router_options= slave servers=server1,server2,server3,server4 user=maxskysql -passwd=skysql +password=skysql [Read Connection Listener Slave] type=listener diff --git a/maxscale-system-test/cnf/maxscale.cnf.template.bug673 b/maxscale-system-test/cnf/maxscale.cnf.template.bug673 index e0f68ead3..408cda1a7 100755 --- a/maxscale-system-test/cnf/maxscale.cnf.template.bug673 +++ b/maxscale-system-test/cnf/maxscale.cnf.template.bug673 @@ -7,7 +7,7 @@ type=monitor module=mysqlmon servers=server1 user=maxskysql -passwd=skysql +password=skysql monitor_interval=1000 backend_connect_timeout=1 @@ -16,7 +16,7 @@ type=service router=readconnroute servers=server1 user=maxskysql -passwd=skysql +password=skysql [RW Split Listener] type=listener diff --git a/maxscale-system-test/cnf/maxscale.cnf.template.bug694 b/maxscale-system-test/cnf/maxscale.cnf.template.bug694 index 9435c1238..d7c49b598 100755 --- a/maxscale-system-test/cnf/maxscale.cnf.template.bug694 +++ b/maxscale-system-test/cnf/maxscale.cnf.template.bug694 @@ -7,14 +7,14 @@ type=monitor module=mysqlmon servers= server1, server2,server3 ,server4 user=maxskysql -passwd= skysql +password= skysql [RW Split Router] type=service router= readwritesplit servers=server1, server2, server3,server4 user=maxskysql -passwd=skysql +password=skysql use_sql_variables_in=all [Read Connection Router Slave] @@ -23,7 +23,7 @@ router=readconnroute router_options= slave servers=server1,server2,server3,server4 user=maxskysql -passwd=skysql +password=skysql [Read Connection Router Master] type=service @@ -31,7 +31,7 @@ router=readconnroute router_options=master servers=server1,server2,server3,server4 user=maxskysql -passwd=skysql +password=skysql [RW Split Listener] type=listener diff --git a/maxscale-system-test/cnf/maxscale.cnf.template.bug705 b/maxscale-system-test/cnf/maxscale.cnf.template.bug705 index a8926406f..ae6a7c15b 100755 --- a/maxscale-system-test/cnf/maxscale.cnf.template.bug705 +++ b/maxscale-system-test/cnf/maxscale.cnf.template.bug705 @@ -7,14 +7,14 @@ type=monitor module=mysqlmon servers= server1, server2,server3 ,server4 user=maxskysql -passwd= skysql +password= skysql [RW Split Router] type=service router= readwritesplit servers=server1 user=maxskysql -passwd=skysql +password=skysql [Read Connection Router Slave] type=service @@ -22,7 +22,7 @@ router=readconnroute router_options= slave servers=server1,server2,server3,server4 user=maxskysql -passwd=skysql +password=skysql [Read Connection Router Master] type=service @@ -30,7 +30,7 @@ router=readconnroute router_options=master servers=server1,server2,server3,server4 user=maxskysql -passwd=skysql +password=skysql [RW Split Listener] type=listener diff --git a/maxscale-system-test/cnf/maxscale.cnf.template.bug711 b/maxscale-system-test/cnf/maxscale.cnf.template.bug711 index 3e0e976b1..00d4995bd 100755 --- a/maxscale-system-test/cnf/maxscale.cnf.template.bug711 +++ b/maxscale-system-test/cnf/maxscale.cnf.template.bug711 @@ -7,14 +7,14 @@ type=monitor module=mysqlmon servers= server1, server2,server3 ,server4 user=maxskysql -passwd= skysql +password= skysql [RW Split Router] type=service router= readwritesplit servers=server1, server2, server3,server4 user=maxskysql -passwd=skysql +password=skysql router_options=slave_selection_criteria=LEAST_ROUTER_CONNECTIONS use_sql_variables_in=all @@ -24,7 +24,7 @@ router=readconnroute router_options= slave servers=server1,server2,server3,server4 user=maxskysql -passwd=skysql +password=skysql [Read Connection Router Master] type=service @@ -32,7 +32,7 @@ router=readconnroute router_options=master servers=server1,server2,server3,server4 user=maxskysql -passwd=skysql +password=skysql [RW Split Listener] type=listener diff --git a/maxscale-system-test/cnf/maxscale.cnf.template.bug718 b/maxscale-system-test/cnf/maxscale.cnf.template.bug718 index 0037bb149..488fa1b88 100755 --- a/maxscale-system-test/cnf/maxscale.cnf.template.bug718 +++ b/maxscale-system-test/cnf/maxscale.cnf.template.bug718 @@ -7,7 +7,7 @@ type=service router= readwritesplit servers=server1, server2, server3,server4 user=maxskysql -passwd=skysql +password=skysql [Read Connection Router Slave] type=service @@ -15,7 +15,7 @@ router=readconnroute router_options= slave servers=server1,server2,server3,server4 user=maxskysql -passwd=skysql +password=skysql [Read Connection Router Master] type=service @@ -23,7 +23,7 @@ router=readconnroute router_options=master servers=server1,server2,server3,server4 user=maxskysql -passwd=skysql +password=skysql [RW Split Router Galera] @@ -31,7 +31,7 @@ type=service router= readwritesplit servers=g_server1, g_server2, g_server3, g_server4 user=maxskysql -passwd=skysql +password=skysql [RW Split Listener] type=listener diff --git a/maxscale-system-test/cnf/maxscale.cnf.template.bug730 b/maxscale-system-test/cnf/maxscale.cnf.template.bug730 index b2c2bb2be..d66abd3b8 100755 --- a/maxscale-system-test/cnf/maxscale.cnf.template.bug730 +++ b/maxscale-system-test/cnf/maxscale.cnf.template.bug730 @@ -7,14 +7,14 @@ type=monitor module=mysqlmon servers= server1, server2,server3 ,server4 user=maxskysql -passwd= skysql +password= skysql [RW Split Router] type=service router= readwritesplit servers=server1, server2, server3,server4 user=maxskysql -passwd=skysql +password=skysql router_options=slave_selection_criteria=LEAST_ROUTER_CONNECTIONS filters=MySetOptionFilter @@ -31,7 +31,7 @@ router=readconnroute router_options= slave servers=server1,server2,server3,server4 user=maxskysql -passwd=skysql +password=skysql filters=MySetOptionFilter [Read Connection Router Master] @@ -40,7 +40,7 @@ router=readconnroute router_options=master servers=server1,server2,server3,server4 user=maxskysql -passwd=skysql +password=skysql filters=MySetOptionFilter [RW Split Listener] diff --git a/maxscale-system-test/cnf/maxscale.cnf.template.bulk_insert b/maxscale-system-test/cnf/maxscale.cnf.template.bulk_insert index 094452ca7..243d2cbda 100755 --- a/maxscale-system-test/cnf/maxscale.cnf.template.bulk_insert +++ b/maxscale-system-test/cnf/maxscale.cnf.template.bulk_insert @@ -6,7 +6,7 @@ type=monitor module=mysqlmon servers=server1 user=maxskysql -passwd=skysql +password=skysql monitor_interval=1000 [RW Split Router] @@ -14,7 +14,7 @@ type=service router=readwritesplit servers=server1 user=maxskysql -passwd=skysql +password=skysql [Read Connection Router Slave] type=service @@ -22,7 +22,7 @@ router=readconnroute router_options=slave servers=server1 user=maxskysql -passwd=skysql +password=skysql [Read Connection Router Master] type=service @@ -30,7 +30,7 @@ router=readconnroute router_options=master servers=server1 user=maxskysql -passwd=skysql +password=skysql [RW Split Listener] type=listener diff --git a/maxscale-system-test/cnf/maxscale.cnf.template.cache_basic b/maxscale-system-test/cnf/maxscale.cnf.template.cache_basic index 607fbb671..6bb12ecd9 100644 --- a/maxscale-system-test/cnf/maxscale.cnf.template.cache_basic +++ b/maxscale-system-test/cnf/maxscale.cnf.template.cache_basic @@ -7,7 +7,7 @@ type=monitor module=mysqlmon servers=server1,server2 user=maxskysql -passwd= skysql +password= skysql monitor_interval=1000 detect_stale_master=false @@ -17,7 +17,7 @@ router=readconnroute router_options= slave servers=server1,server2 user=maxskysql -passwd=skysql +password=skysql [Read Connection Router Master] type=service @@ -25,7 +25,7 @@ router=readconnroute router_options=master servers=server1,server2 user=maxskysql -passwd=skysql +password=skysql filters=Cache [Read Connection Listener Slave] diff --git a/maxscale-system-test/cnf/maxscale.cnf.template.cache_runtime b/maxscale-system-test/cnf/maxscale.cnf.template.cache_runtime index 4fa7eaf78..a7611a593 100644 --- a/maxscale-system-test/cnf/maxscale.cnf.template.cache_runtime +++ b/maxscale-system-test/cnf/maxscale.cnf.template.cache_runtime @@ -13,7 +13,7 @@ type=monitor module=mysqlmon servers=server1 user=maxskysql -passwd=skysql +password=skysql monitor_interval=1000 detect_stale_master=false @@ -30,7 +30,7 @@ type=service router= readwritesplit servers=server1 user=maxskysql -passwd=skysql +password=skysql filters=Cache [RWS-Listener] diff --git a/maxscale-system-test/cnf/maxscale.cnf.template.cache_runtime_ttl b/maxscale-system-test/cnf/maxscale.cnf.template.cache_runtime_ttl index b8ed07a4e..d0d1a890b 100644 --- a/maxscale-system-test/cnf/maxscale.cnf.template.cache_runtime_ttl +++ b/maxscale-system-test/cnf/maxscale.cnf.template.cache_runtime_ttl @@ -13,7 +13,7 @@ type=monitor module=mysqlmon servers=server1 user=maxskysql -passwd=skysql +password=skysql monitor_interval=1000 detect_stale_master=false @@ -27,7 +27,7 @@ type=service router= readwritesplit servers=server1 user=maxskysql -passwd=skysql +password=skysql filters=Cache [RWS-Listener] diff --git a/maxscale-system-test/cnf/maxscale.cnf.template.ccrfilter b/maxscale-system-test/cnf/maxscale.cnf.template.ccrfilter index 5b94effcf..7b887818b 100644 --- a/maxscale-system-test/cnf/maxscale.cnf.template.ccrfilter +++ b/maxscale-system-test/cnf/maxscale.cnf.template.ccrfilter @@ -6,7 +6,7 @@ type=monitor module=mysqlmon servers=server1,server2,server3,server4 user=maxskysql -passwd=skysql +password=skysql monitor_interval=1000 detect_stale_master=false @@ -27,7 +27,7 @@ type=service router=readwritesplit servers=server1,server2,server3,server4 user=maxskysql -passwd=skysql +password=skysql router_options=slave_selection_criteria=LEAST_GLOBAL_CONNECTIONS max_slave_connections=1 filters=ccrfilter @@ -46,7 +46,7 @@ router=readconnroute router_options=slave servers=server1,server2,server3,server4 user=maxskysql -passwd=skysql +password=skysql [Read Connection Listener Slave] type=listener @@ -62,7 +62,7 @@ router=readconnroute router_options=master servers=server1,server2,server3,server4 user=maxskysql -passwd=skysql +password=skysql [Read Connection Listener Master] type=listener diff --git a/maxscale-system-test/cnf/maxscale.cnf.template.check_backend b/maxscale-system-test/cnf/maxscale.cnf.template.check_backend index f72ea18d3..3d6172a25 100755 --- a/maxscale-system-test/cnf/maxscale.cnf.template.check_backend +++ b/maxscale-system-test/cnf/maxscale.cnf.template.check_backend @@ -7,7 +7,7 @@ type=monitor module=mysqlmon servers= server1, server2,server3 ,server4 user=maxskysql -passwd= skysql +password= skysql monitor_interval=1000 [Galera Monitor] @@ -15,7 +15,7 @@ type=monitor module=galeramon servers=gserver1,gserver2,gserver3,gserver4 user=maxskysql -passwd=skysql +password=skysql monitor_interval=1000 root_node_as_master=false @@ -24,7 +24,7 @@ type=service router= readwritesplit servers=server1, server2, server3,server4 user=maxskysql -passwd=skysql +password=skysql router_options=slave_selection_criteria=LEAST_ROUTER_CONNECTIONS [RW Split Router Galera] @@ -32,7 +32,7 @@ type=service router= readwritesplit servers=gserver1,gserver2,gserver3,gserver4 user=maxskysql -passwd=skysql +password=skysql router_options=slave_selection_criteria=LEAST_ROUTER_CONNECTIONS [Read Connection Router Slave] @@ -41,7 +41,7 @@ router=readconnroute router_options= slave servers=server1,server2,server3,server4 user=maxskysql -passwd=skysql +password=skysql [Read Connection Router Master] type=service @@ -49,7 +49,7 @@ router=readconnroute router_options=master servers=server1,server2,server3,server4 user=maxskysql -passwd=skysql +password=skysql [RW Split Listener] type=listener diff --git a/maxscale-system-test/cnf/maxscale.cnf.template.config_reload b/maxscale-system-test/cnf/maxscale.cnf.template.config_reload index 8a059494e..c5eeec155 100644 --- a/maxscale-system-test/cnf/maxscale.cnf.template.config_reload +++ b/maxscale-system-test/cnf/maxscale.cnf.template.config_reload @@ -7,7 +7,7 @@ type=monitor module=mysqlmon servers= server1, server2,server3 ,server4 user=maxskysql -passwd= skysql +password= skysql [CLI] type=service @@ -24,7 +24,7 @@ type=service router= readwritesplit servers=server1, server2, server3,server4 user=maxskysql -passwd=skysql +password=skysql router_options=slave_selection_criteria=LEAST_ROUTER_CONNECTIONS [RW Split Listener] diff --git a/maxscale-system-test/cnf/maxscale.cnf.template.connection_limit b/maxscale-system-test/cnf/maxscale.cnf.template.connection_limit index c3e971672..ee5074b13 100755 --- a/maxscale-system-test/cnf/maxscale.cnf.template.connection_limit +++ b/maxscale-system-test/cnf/maxscale.cnf.template.connection_limit @@ -7,7 +7,7 @@ type=monitor module=mysqlmon servers= server1, server2,server3 ,server4 user=maxskysql -passwd= skysql +password= skysql monitor_interval=1000 detect_stale_master=false @@ -17,7 +17,7 @@ type=service router= readwritesplit servers=server1, server2, server3,server4 user=maxskysql -passwd=skysql +password=skysql router_options=slave_selection_criteria=LEAST_GLOBAL_CONNECTIONS max_slave_connections=1 max_connections=10 @@ -28,7 +28,7 @@ router=readconnroute router_options= slave servers=server1,server2,server3,server4 user=maxskysql -passwd=skysql +password=skysql max_connections=25 [Read Connection Router Master] @@ -37,7 +37,7 @@ router=readconnroute router_options=master servers=server1,server2,server3,server4 user=maxskysql -passwd=skysql +password=skysql max_connections=20 [RW Split Listener] diff --git a/maxscale-system-test/cnf/maxscale.cnf.template.fwf b/maxscale-system-test/cnf/maxscale.cnf.template.fwf index 7a0d19549..7153f8b7f 100755 --- a/maxscale-system-test/cnf/maxscale.cnf.template.fwf +++ b/maxscale-system-test/cnf/maxscale.cnf.template.fwf @@ -7,7 +7,7 @@ type=monitor module=mysqlmon servers=server1 user=maxskysql -passwd=skysql +password=skysql monitor_interval=100 [Database Firewall] @@ -22,7 +22,7 @@ type=service router=readconnroute servers=server1 user=maxskysql -passwd=skysql +password=skysql filters=Database Firewall [Read Connection Router Slave] @@ -31,7 +31,7 @@ router=readconnroute router_options=slave servers=server1 user=maxskysql -passwd=skysql +password=skysql [Read Connection Router Master] type=service @@ -39,7 +39,7 @@ router=readconnroute router_options=master servers=server1 user=maxskysql -passwd=skysql +password=skysql [RW Split Listener] type=listener diff --git a/maxscale-system-test/cnf/maxscale.cnf.template.fwf_action b/maxscale-system-test/cnf/maxscale.cnf.template.fwf_action index 0c1ac42e0..152b5de9b 100644 --- a/maxscale-system-test/cnf/maxscale.cnf.template.fwf_action +++ b/maxscale-system-test/cnf/maxscale.cnf.template.fwf_action @@ -6,7 +6,7 @@ type=monitor module=mysqlmon servers=server1 user=maxskysql -passwd=skysql +password=skysql monitor_interval=1000 [server1] @@ -22,7 +22,7 @@ type=service router=readconnroute servers=server1 user=maxskysql -passwd=skysql +password=skysql filters=blacklist [readconn-blacklist-listener] @@ -46,7 +46,7 @@ type=service router=readconnroute servers=server1 user=maxskysql -passwd=skysql +password=skysql filters=whitelist [readconn-whitelist-listener] @@ -70,7 +70,7 @@ type=service router=readconnroute servers=server1 user=maxskysql -passwd=skysql +password=skysql filters=ignore [readconn-ignore-listener] diff --git a/maxscale-system-test/cnf/maxscale.cnf.template.fwf_com_ping b/maxscale-system-test/cnf/maxscale.cnf.template.fwf_com_ping index 7008cf0b0..c372162b7 100644 --- a/maxscale-system-test/cnf/maxscale.cnf.template.fwf_com_ping +++ b/maxscale-system-test/cnf/maxscale.cnf.template.fwf_com_ping @@ -6,7 +6,7 @@ type=monitor module=mysqlmon servers=server1 user=maxskysql -passwd=skysql +password=skysql monitor_interval=1000 [server1] @@ -22,7 +22,7 @@ type=service router=readconnroute servers=server1 user=maxskysql -passwd=skysql +password=skysql filters=whitelist [readconn-whitelist-listener] diff --git a/maxscale-system-test/cnf/maxscale.cnf.template.fwf_logging b/maxscale-system-test/cnf/maxscale.cnf.template.fwf_logging index ec9a4055f..64a26471f 100644 --- a/maxscale-system-test/cnf/maxscale.cnf.template.fwf_logging +++ b/maxscale-system-test/cnf/maxscale.cnf.template.fwf_logging @@ -12,7 +12,7 @@ type=monitor module=mysqlmon servers=server1 user=maxskysql -passwd=skysql +password=skysql monitor_interval=1000 [readconn] @@ -20,7 +20,7 @@ type=service router=readconnroute servers=server1 user=maxskysql -passwd=skysql +password=skysql filters=ignore [readconn-listener] diff --git a/maxscale-system-test/cnf/maxscale.cnf.template.fwf_syntax b/maxscale-system-test/cnf/maxscale.cnf.template.fwf_syntax index 893b4d6f1..da495fdfa 100644 --- a/maxscale-system-test/cnf/maxscale.cnf.template.fwf_syntax +++ b/maxscale-system-test/cnf/maxscale.cnf.template.fwf_syntax @@ -7,7 +7,7 @@ type=service router=readconnroute servers=server1 user=maxskysql -passwd=skysql +password=skysql filters=Database Firewall [Read Connection Listener Slave] diff --git a/maxscale-system-test/cnf/maxscale.cnf.template.galera b/maxscale-system-test/cnf/maxscale.cnf.template.galera index d8654e688..1564ac0c6 100755 --- a/maxscale-system-test/cnf/maxscale.cnf.template.galera +++ b/maxscale-system-test/cnf/maxscale.cnf.template.galera @@ -6,7 +6,7 @@ type=monitor module=galeramon servers=server1,server2,server3,server4 user=maxskysql -passwd=skysql +password=skysql monitor_interval=1000 root_node_as_master=false @@ -15,7 +15,7 @@ type=service router=readwritesplit servers=server1,server2,server3,server4 user=maxskysql -passwd=skysql +password=skysql router_options=slave_selection_criteria=LEAST_GLOBAL_CONNECTIONS max_slave_connections=1 @@ -25,7 +25,7 @@ router=readconnroute router_options=slave servers=server1,server2,server3,server4 user=maxskysql -passwd=skysql +password=skysql [Read Connection Router Master] type=service @@ -33,7 +33,7 @@ router=readconnroute router_options=master servers=server1,server2,server3,server4 user=maxskysql -passwd=skysql +password=skysql [RW Split Listener] type=listener diff --git a/maxscale-system-test/cnf/maxscale.cnf.template.galera.bug681 b/maxscale-system-test/cnf/maxscale.cnf.template.galera.bug681 index 938111b73..70d6d5322 100755 --- a/maxscale-system-test/cnf/maxscale.cnf.template.galera.bug681 +++ b/maxscale-system-test/cnf/maxscale.cnf.template.galera.bug681 @@ -7,9 +7,9 @@ type=monitor module=galeramon servers=server1,server2,server3 #user=maxmon -#passwd=maxpwd +#password=maxpwd user=maxskysql -passwd=skysql +password=skysql root_node_as_master=false [RW Split Router] @@ -17,9 +17,9 @@ type=service router=readwritesplit servers=server1,server2,server3 #user=maxpriv -#passwd=maxpwd +#password=maxpwd user=maxskysql -passwd=skysql +password=skysql filters=MyLogFilter version_string=MariaDBEC-10.0.14 localhost_match_wildcard_host=1 @@ -33,9 +33,9 @@ router=readconnroute router_options=synced servers=server1,server2,server3 #user=maxpriv -#passwd=maxpwd +#password=maxpwd user=maxskysql -passwd=skysql +password=skysql [Read Connection Listener Slave] type=listener @@ -49,7 +49,7 @@ router=readconnroute router_options= slave servers=server1,server2,server3 user=maxskysql -passwd=skysql +password=skysql [RW Split Listener] type=listener diff --git a/maxscale-system-test/cnf/maxscale.cnf.template.galera.weight b/maxscale-system-test/cnf/maxscale.cnf.template.galera.weight index 773433c4d..60fb7b2e3 100755 --- a/maxscale-system-test/cnf/maxscale.cnf.template.galera.weight +++ b/maxscale-system-test/cnf/maxscale.cnf.template.galera.weight @@ -7,7 +7,7 @@ type=monitor module=galeramon servers=server1,server2,server3,server4 user=maxskysql -passwd=skysql +password=skysql use_priority=true root_node_as_master=false @@ -19,7 +19,7 @@ weightby=serversize_rws router_options=slave_selection_criteria=LEAST_ROUTER_CONNECTIONS max_slave_connections=1 user=maxskysql -passwd=skysql +password=skysql [Read Connection Router] type=service @@ -28,7 +28,7 @@ router_options=synced servers=server1,server2,server3,server4 weightby=serversize user=maxskysql -passwd=skysql +password=skysql [RW Split Listener] type=listener diff --git a/maxscale-system-test/cnf/maxscale.cnf.template.galera_hartmut b/maxscale-system-test/cnf/maxscale.cnf.template.galera_hartmut index fbfbb4d6c..c07bb86bd 100644 --- a/maxscale-system-test/cnf/maxscale.cnf.template.galera_hartmut +++ b/maxscale-system-test/cnf/maxscale.cnf.template.galera_hartmut @@ -7,7 +7,7 @@ type=monitor module=galeramon servers=server1,server2,server3,server4 user=maxskysql -passwd=skysql +password=skysql monitor_interval=1000 root_node_as_master=false @@ -16,7 +16,7 @@ type=service router=readwritesplit servers=server1,server2,server3,server4 user=maxskysql -passwd=skysql +password=skysql router_options=slave_selection_criteria=LEAST_GLOBAL_CONNECTIONS max_slave_connections=1 @@ -26,7 +26,7 @@ router=readconnroute router_options=slave servers=server1,server2,server3,server4 user=maxskysql -passwd=skysql +password=skysql [Read Connection Router Master] type=service @@ -34,7 +34,7 @@ router=readconnroute router_options=master servers=server1,server2,server3,server4 user=maxskysql -passwd=skysql +password=skysql [RW Split Listener] type=listener diff --git a/maxscale-system-test/cnf/maxscale.cnf.template.galera_mxs564 b/maxscale-system-test/cnf/maxscale.cnf.template.galera_mxs564 index 292d6b7fe..c8e52d034 100644 --- a/maxscale-system-test/cnf/maxscale.cnf.template.galera_mxs564 +++ b/maxscale-system-test/cnf/maxscale.cnf.template.galera_mxs564 @@ -7,7 +7,7 @@ type=monitor module=galeramon servers=server1,server2,server3,server4 user=maxskysql -passwd=skysql +password=skysql root_node_as_master=false [RW Split Router] @@ -15,7 +15,7 @@ type=service router=readwritesplit servers=server1,server2,server3,server4 user=maxskysql -passwd=skysql +password=skysql [Read Connection Router Slave] type=service @@ -23,7 +23,7 @@ router=readconnroute router_options= slave servers=server1,server2,server3,server4 user=maxskysql -passwd=skysql +password=skysql [Read Connection Router Master] type=service @@ -31,7 +31,7 @@ router=readconnroute router_options=master servers=server1,server2,server3,server4 user=maxskysql -passwd=skysql +password=skysql [RW Split Listener] type=listener diff --git a/maxscale-system-test/cnf/maxscale.cnf.template.galera_priority b/maxscale-system-test/cnf/maxscale.cnf.template.galera_priority index 88d5bfe31..b43addfcd 100644 --- a/maxscale-system-test/cnf/maxscale.cnf.template.galera_priority +++ b/maxscale-system-test/cnf/maxscale.cnf.template.galera_priority @@ -9,7 +9,7 @@ type=monitor module=galeramon servers=server1,server2,server3,server4 user=maxskysql -passwd=skysql +password=skysql use_priority=true monitor_interval=1000 root_node_as_master=false @@ -19,7 +19,7 @@ type=service router=readwritesplit servers=server1,server2,server3,server4 user=maxskysql -passwd=skysql +password=skysql [RW Split Listener] type=listener diff --git a/maxscale-system-test/cnf/maxscale.cnf.template.gatekeeper b/maxscale-system-test/cnf/maxscale.cnf.template.gatekeeper index ea12e225e..7407edd15 100644 --- a/maxscale-system-test/cnf/maxscale.cnf.template.gatekeeper +++ b/maxscale-system-test/cnf/maxscale.cnf.template.gatekeeper @@ -9,7 +9,7 @@ type=monitor module=mysqlmon servers= server1, server2,server3 ,server4 user=maxskysql -passwd= skysql +password= skysql monitor_interval=1000 detect_stale_master=false @@ -23,7 +23,7 @@ max_slave_connections=100% use_sql_variables_in=master router_options=slave_selection_criteria=LEAST_BEHIND_MASTER user=maxskysql -passwd=skysql +password=skysql filters=gatekeeper [CLI] diff --git a/maxscale-system-test/cnf/maxscale.cnf.template.hartmut b/maxscale-system-test/cnf/maxscale.cnf.template.hartmut index 99877da5b..af7323c33 100755 --- a/maxscale-system-test/cnf/maxscale.cnf.template.hartmut +++ b/maxscale-system-test/cnf/maxscale.cnf.template.hartmut @@ -7,7 +7,7 @@ type=monitor module=mysqlmon servers= server1, server2,server3 ,server4 user=maxskysql -passwd= skysql +password= skysql monitor_interval=500 detect_replication_lag=1 @@ -16,7 +16,7 @@ type=service router= readwritesplit servers=server1, server2, server3,server4 user=maxskysql -passwd=skysql +password=skysql router_options=slave_selection_criteria=LEAST_ROUTER_CONNECTIONS max_slave_replication_lag=1 @@ -26,7 +26,7 @@ router=readconnroute router_options= slave servers=server1,server2,server3,server4 user=maxskysql -passwd=skysql +password=skysql [Read Connection Router Master] type=service @@ -34,7 +34,7 @@ router=readconnroute router_options=master servers=server1,server2,server3,server4 user=maxskysql -passwd=skysql +password=skysql [RW Split Listener] type=listener diff --git a/maxscale-system-test/cnf/maxscale.cnf.template.hints b/maxscale-system-test/cnf/maxscale.cnf.template.hints index 0ac817ed2..b1152b9ca 100755 --- a/maxscale-system-test/cnf/maxscale.cnf.template.hints +++ b/maxscale-system-test/cnf/maxscale.cnf.template.hints @@ -7,7 +7,7 @@ type=monitor module=mysqlmon servers= server1, server2,server3 ,server4 user=maxskysql -passwd= skysql +password= skysql [hints] type=filter @@ -18,7 +18,7 @@ type=service router= readwritesplit servers=server1, server2, server3,server4 user=maxskysql -passwd=skysql +password=skysql max_slave_connections=100% use_sql_variables_in=all router_options=slave_selection_criteria=LEAST_BEHIND_MASTER @@ -31,7 +31,7 @@ router=readconnroute router_options= slave servers=server1,server2,server3,server4 user=maxskysql -passwd=skysql +password=skysql [Read Connection Router Master] type=service @@ -39,7 +39,7 @@ router=readconnroute router_options=master servers=server1,server2,server3,server4 user=maxskysql -passwd=skysql +password=skysql [RW Split Listener] type=listener diff --git a/maxscale-system-test/cnf/maxscale.cnf.template.hints2 b/maxscale-system-test/cnf/maxscale.cnf.template.hints2 index 5ed762087..ee94d624b 100644 --- a/maxscale-system-test/cnf/maxscale.cnf.template.hints2 +++ b/maxscale-system-test/cnf/maxscale.cnf.template.hints2 @@ -7,7 +7,7 @@ type=monitor module=mysqlmon servers= server1,server2,server3,server4 user=maxskysql -passwd= skysql +password= skysql [hints] type=filter @@ -18,7 +18,7 @@ type=service router= readwritesplit servers=server1,server2,server3,server4 user=maxskysql -passwd=skysql +password=skysql max_slave_connections=100% use_sql_variables_in=all router_options=slave_selection_criteria=LEAST_BEHIND_MASTER @@ -30,7 +30,7 @@ router=readconnroute router_options=slave servers=server1,server2,server3,server4 user=maxskysql -passwd=skysql +password=skysql [Read Connection Router Master] type=service @@ -38,7 +38,7 @@ router=readconnroute router_options=master servers=server1,server2,server3,server4 user=maxskysql -passwd=skysql +password=skysql [RW Split Listener] type=listener diff --git a/maxscale-system-test/cnf/maxscale.cnf.template.insertstream b/maxscale-system-test/cnf/maxscale.cnf.template.insertstream index d9bde27e3..bd178a470 100755 --- a/maxscale-system-test/cnf/maxscale.cnf.template.insertstream +++ b/maxscale-system-test/cnf/maxscale.cnf.template.insertstream @@ -6,7 +6,7 @@ type=monitor module=mysqlmon servers=server1 user=maxskysql -passwd=skysql +password=skysql monitor_interval=1000 [insertstream] @@ -18,7 +18,7 @@ type=service router=readconnroute servers=server1 user=maxskysql -passwd=skysql +password=skysql filters=insertstream [RW Split Listener] diff --git a/maxscale-system-test/cnf/maxscale.cnf.template.java_prep_stmt b/maxscale-system-test/cnf/maxscale.cnf.template.java_prep_stmt index 7887e5671..40c5fec7b 100644 --- a/maxscale-system-test/cnf/maxscale.cnf.template.java_prep_stmt +++ b/maxscale-system-test/cnf/maxscale.cnf.template.java_prep_stmt @@ -7,7 +7,7 @@ type=monitor module=galeramon servers= server1, server2,server3 ,server4 user=maxskysql -passwd= skysql +password= skysql monitor_interval=1000 root_node_as_master=false @@ -16,7 +16,7 @@ type=service router= readwritesplit servers=server1, server2, server3,server4 user=maxskysql -passwd=skysql +password=skysql version_string=5.5.5-10.0.0-mxs [Read Connection Router Slave] @@ -25,7 +25,7 @@ router=readconnroute router_options= slave servers=server1,server2,server3,server4 user=maxskysql -passwd=skysql +password=skysql version_string=5.5.5-10.0.0-mxs [Read Connection Router Master] @@ -34,7 +34,7 @@ router=readconnroute router_options=master servers=server1,server2,server3,server4 user=maxskysql -passwd=skysql +password=skysql version_string=5.5.5-10.0.0-mxs [RW Split Listener] diff --git a/maxscale-system-test/cnf/maxscale.cnf.template.keepalived.000 b/maxscale-system-test/cnf/maxscale.cnf.template.keepalived.000 index c8fb69a10..6e46c1d1d 100755 --- a/maxscale-system-test/cnf/maxscale.cnf.template.keepalived.000 +++ b/maxscale-system-test/cnf/maxscale.cnf.template.keepalived.000 @@ -6,7 +6,7 @@ type=monitor module=mysqlmon servers=server1,server2,server3,server4 user=maxskysql -passwd=skysql +password=skysql monitor_interval=1000 detect_stale_master=false detect_standalone_master=false @@ -16,7 +16,7 @@ type=service router=readwritesplit servers=server1,server2,server3,server4 user=maxskysql -passwd=skysql +password=skysql router_options=slave_selection_criteria=LEAST_GLOBAL_CONNECTIONS max_slave_connections=1 version_string=10.2-server1 @@ -27,7 +27,7 @@ router=readconnroute router_options=slave servers=server1,server2,server3,server4 user=maxskysql -passwd=skysql +password=skysql version_string=10.2-server1 [Read Connection Router Master] @@ -36,7 +36,7 @@ router=readconnroute router_options=master servers=server1,server2,server3,server4 user=maxskysql -passwd=skysql +password=skysql version_string=10.2-server1 [RW Split Listener] diff --git a/maxscale-system-test/cnf/maxscale.cnf.template.keepalived.001 b/maxscale-system-test/cnf/maxscale.cnf.template.keepalived.001 index fbe67130b..77840e710 100755 --- a/maxscale-system-test/cnf/maxscale.cnf.template.keepalived.001 +++ b/maxscale-system-test/cnf/maxscale.cnf.template.keepalived.001 @@ -6,7 +6,7 @@ type=monitor module=mysqlmon servers=server1,server2,server3,server4 user=maxskysql -passwd=skysql +password=skysql monitor_interval=1000 detect_stale_master=false detect_standalone_master=false @@ -16,7 +16,7 @@ type=service router=readwritesplit servers=server1,server2,server3,server4 user=maxskysql -passwd=skysql +password=skysql router_options=slave_selection_criteria=LEAST_GLOBAL_CONNECTIONS max_slave_connections=1 version_string=10.2-server2 @@ -27,7 +27,7 @@ router=readconnroute router_options=slave servers=server1,server2,server3,server4 user=maxskysql -passwd=skysql +password=skysql version_string=10.2-server2 [Read Connection Router Master] @@ -36,7 +36,7 @@ router=readconnroute router_options=master servers=server1,server2,server3,server4 user=maxskysql -passwd=skysql +password=skysql version_string=10.2-server2 [RW Split Listener] diff --git a/maxscale-system-test/cnf/maxscale.cnf.template.keepalived_masterdown.000 b/maxscale-system-test/cnf/maxscale.cnf.template.keepalived_masterdown.000 index 5f9165946..4b22edd43 100755 --- a/maxscale-system-test/cnf/maxscale.cnf.template.keepalived_masterdown.000 +++ b/maxscale-system-test/cnf/maxscale.cnf.template.keepalived_masterdown.000 @@ -6,7 +6,7 @@ type=monitor module=mariadbmon servers=server1,server2,server3,server4 user=maxskysql -passwd=skysql +password=skysql monitor_interval=1000 detect_stale_master=false detect_standalone_master=false @@ -17,7 +17,7 @@ type=service router=readwritesplit servers=server1,server2,server3,server4 user=maxskysql -passwd=skysql +password=skysql router_options=slave_selection_criteria=LEAST_GLOBAL_CONNECTIONS max_slave_connections=1 version_string=10.2-server1 @@ -28,7 +28,7 @@ router=readconnroute router_options=slave servers=server1,server2,server3,server4 user=maxskysql -passwd=skysql +password=skysql version_string=10.2-server1 [Read Connection Router Master] @@ -37,7 +37,7 @@ router=readconnroute router_options=master servers=server1,server2,server3,server4 user=maxskysql -passwd=skysql +password=skysql version_string=10.2-server1 [RW Split Listener] diff --git a/maxscale-system-test/cnf/maxscale.cnf.template.keepalived_masterdown.001 b/maxscale-system-test/cnf/maxscale.cnf.template.keepalived_masterdown.001 index 688deecc9..5a78dbcb8 100755 --- a/maxscale-system-test/cnf/maxscale.cnf.template.keepalived_masterdown.001 +++ b/maxscale-system-test/cnf/maxscale.cnf.template.keepalived_masterdown.001 @@ -6,7 +6,7 @@ type=monitor module=mariadbmon servers=server1,server2,server3,server4 user=maxskysql -passwd=skysql +password=skysql monitor_interval=1000 detect_stale_master=false detect_standalone_master=false @@ -17,7 +17,7 @@ type=service router=readwritesplit servers=server1,server2,server3,server4 user=maxskysql -passwd=skysql +password=skysql router_options=slave_selection_criteria=LEAST_GLOBAL_CONNECTIONS max_slave_connections=1 version_string=10.2-server2 @@ -28,7 +28,7 @@ router=readconnroute router_options=slave servers=server1,server2,server3,server4 user=maxskysql -passwd=skysql +password=skysql version_string=10.2-server2 [Read Connection Router Master] @@ -37,7 +37,7 @@ router=readconnroute router_options=master servers=server1,server2,server3,server4 user=maxskysql -passwd=skysql +password=skysql version_string=10.2-server2 [RW Split Listener] diff --git a/maxscale-system-test/cnf/maxscale.cnf.template.kerberos b/maxscale-system-test/cnf/maxscale.cnf.template.kerberos index e93d038d1..5df831fff 100755 --- a/maxscale-system-test/cnf/maxscale.cnf.template.kerberos +++ b/maxscale-system-test/cnf/maxscale.cnf.template.kerberos @@ -7,7 +7,7 @@ type=monitor module=mysqlmon servers=server1,server2,server3,server4 user=maxskysql -passwd= skysql +password= skysql monitor_interval=1000 detect_stale_master=false @@ -16,7 +16,7 @@ type=service router=readwritesplit servers=server1,server2,server3,server4 user=maxskysql -passwd=skysql +password=skysql router_options=slave_selection_criteria=LEAST_GLOBAL_CONNECTIONS max_slave_connections=1 @@ -26,7 +26,7 @@ router=readconnroute router_options= slave servers=server1,server2,server3,server4 user=maxskysql -passwd=skysql +password=skysql [Read Connection Router Master] type=service @@ -34,7 +34,7 @@ router=readconnroute router_options=master servers=server1,server2,server3,server4 user=maxskysql -passwd=skysql +password=skysql [RW Split Listener] type=listener diff --git a/maxscale-system-test/cnf/maxscale.cnf.template.lag b/maxscale-system-test/cnf/maxscale.cnf.template.lag index 9a43a8b85..fdb4ee69b 100755 --- a/maxscale-system-test/cnf/maxscale.cnf.template.lag +++ b/maxscale-system-test/cnf/maxscale.cnf.template.lag @@ -8,7 +8,7 @@ module=mysqlmon servers= server1, server2,server3 ,server4 detect_replication_lag=1 user=maxskysql -passwd= skysql +password= skysql backend_connect_timeout=10 backend_read_timeout=10 backend_write_timeout=10 @@ -23,7 +23,7 @@ type=service router= readwritesplit servers=server1, server2, server3,server4 user=maxskysql -passwd=skysql +password=skysql max_slave_connections=100% use_sql_variables_in=all router_options=slave_selection_criteria=LEAST_BEHIND_MASTER @@ -37,7 +37,7 @@ router=readconnroute router_options= slave servers=server1,server2,server3,server4 user=maxskysql -passwd=skysql +password=skysql [Read Connection Router Master] type=service @@ -45,7 +45,7 @@ router=readconnroute router_options=master servers=server1,server2,server3,server4 user=maxskysql -passwd=skysql +password=skysql [RW Split Listener] type=listener diff --git a/maxscale-system-test/cnf/maxscale.cnf.template.load b/maxscale-system-test/cnf/maxscale.cnf.template.load index 12d7d35f2..801cc98be 100755 --- a/maxscale-system-test/cnf/maxscale.cnf.template.load +++ b/maxscale-system-test/cnf/maxscale.cnf.template.load @@ -7,14 +7,14 @@ type=monitor module=mysqlmon servers= server1, server2,server3 ,server4 user=maxskysql -passwd= skysql +password= skysql [RW Split Router] type=service router= readwritesplit servers=server1,server2,server3,server4 user=maxskysql -passwd=skysql +password=skysql max_slave_connections=100% router_options=slave_selection_criteria=LEAST_CURRENT_OPERATIONS @@ -24,7 +24,7 @@ router=readconnroute router_options= slave servers=server1,server2,server3,server4 user=maxskysql -passwd=skysql +password=skysql [Read Connection Router Master] type=service @@ -32,7 +32,7 @@ router=readconnroute router_options=master servers=server1,server2,server3,server4 user=maxskysql -passwd=skysql +password=skysql [RW Split Listener] type=listener diff --git a/maxscale-system-test/cnf/maxscale.cnf.template.load_galera b/maxscale-system-test/cnf/maxscale.cnf.template.load_galera index c68d8cdea..1a2bafa6d 100755 --- a/maxscale-system-test/cnf/maxscale.cnf.template.load_galera +++ b/maxscale-system-test/cnf/maxscale.cnf.template.load_galera @@ -7,7 +7,7 @@ type=monitor module=galeramon servers=server1,server2,server3,server4 user=maxskysql -passwd=skysql +password=skysql root_node_as_master=false [RW Split Router] @@ -15,7 +15,7 @@ type=service router= readwritesplit servers=server1,server2,server3,server4 user=maxskysql -passwd=skysql +password=skysql max_slave_connections=100% router_options=slave_selection_criteria=LEAST_CURRENT_OPERATIONS @@ -25,7 +25,7 @@ router=readconnroute router_options= slave servers=server1,server2,server3,server4 user=maxskysql -passwd=skysql +password=skysql [Read Connection Router Master] type=service @@ -33,7 +33,7 @@ router=readconnroute router_options=master servers=server1,server2,server3,server4 user=maxskysql -passwd=skysql +password=skysql [RW Split Listener] type=listener diff --git a/maxscale-system-test/cnf/maxscale.cnf.template.load_galera_pers1 b/maxscale-system-test/cnf/maxscale.cnf.template.load_galera_pers1 index 0087b964a..1b873c693 100755 --- a/maxscale-system-test/cnf/maxscale.cnf.template.load_galera_pers1 +++ b/maxscale-system-test/cnf/maxscale.cnf.template.load_galera_pers1 @@ -7,7 +7,7 @@ type=monitor module=galeramon servers=server1,server2,server3,server4 user=maxskysql -passwd=skysql +password=skysql root_node_as_master=false [RW Split Router] @@ -15,7 +15,7 @@ type=service router= readwritesplit servers=server1,server2,server3,server4 user=maxskysql -passwd=skysql +password=skysql max_slave_connections=100% router_options=slave_selection_criteria=LEAST_CURRENT_OPERATIONS @@ -25,7 +25,7 @@ router=readconnroute router_options= slave servers=server1,server2,server3,server4 user=maxskysql -passwd=skysql +password=skysql [Read Connection Router Master] type=service @@ -33,7 +33,7 @@ router=readconnroute router_options=master servers=server1,server2,server3,server4 user=maxskysql -passwd=skysql +password=skysql [RW Split Listener] type=listener diff --git a/maxscale-system-test/cnf/maxscale.cnf.template.load_galera_pers10 b/maxscale-system-test/cnf/maxscale.cnf.template.load_galera_pers10 index 553ed8cb6..157fdf948 100755 --- a/maxscale-system-test/cnf/maxscale.cnf.template.load_galera_pers10 +++ b/maxscale-system-test/cnf/maxscale.cnf.template.load_galera_pers10 @@ -7,7 +7,7 @@ type=monitor module=galeramon servers=server1,server2,server3,server4 user=maxskysql -passwd=skysql +password=skysql root_node_as_master=false [RW Split Router] @@ -15,7 +15,7 @@ type=service router= readwritesplit servers=server1,server2,server3,server4 user=maxskysql -passwd=skysql +password=skysql max_slave_connections=100% router_options=slave_selection_criteria=LEAST_CURRENT_OPERATIONS @@ -25,7 +25,7 @@ router=readconnroute router_options= slave servers=server1,server2,server3,server4 user=maxskysql -passwd=skysql +password=skysql [Read Connection Router Master] type=service @@ -33,7 +33,7 @@ router=readconnroute router_options=master servers=server1,server2,server3,server4 user=maxskysql -passwd=skysql +password=skysql [RW Split Listener] type=listener diff --git a/maxscale-system-test/cnf/maxscale.cnf.template.load_pers1 b/maxscale-system-test/cnf/maxscale.cnf.template.load_pers1 index e79bcc540..8c2ba7cbb 100755 --- a/maxscale-system-test/cnf/maxscale.cnf.template.load_pers1 +++ b/maxscale-system-test/cnf/maxscale.cnf.template.load_pers1 @@ -7,14 +7,14 @@ type=monitor module=mysqlmon servers= server1, server2,server3 ,server4 user=maxskysql -passwd= skysql +password= skysql [RW Split Router] type=service router= readwritesplit servers=server1,server2,server3,server4 user=maxskysql -passwd=skysql +password=skysql max_slave_connections=100% router_options=slave_selection_criteria=LEAST_CURRENT_OPERATIONS @@ -24,7 +24,7 @@ router=readconnroute router_options= slave servers=server1,server2,server3,server4 user=maxskysql -passwd=skysql +password=skysql [Read Connection Router Master] type=service @@ -32,7 +32,7 @@ router=readconnroute router_options=master servers=server1,server2,server3,server4 user=maxskysql -passwd=skysql +password=skysql [RW Split Listener] type=listener diff --git a/maxscale-system-test/cnf/maxscale.cnf.template.load_pers10 b/maxscale-system-test/cnf/maxscale.cnf.template.load_pers10 index dbb745359..760184242 100755 --- a/maxscale-system-test/cnf/maxscale.cnf.template.load_pers10 +++ b/maxscale-system-test/cnf/maxscale.cnf.template.load_pers10 @@ -7,14 +7,14 @@ type=monitor module=mysqlmon servers= server1, server2,server3 ,server4 user=maxskysql -passwd= skysql +password= skysql [RW Split Router] type=service router= readwritesplit servers=server1,server2,server3,server4 user=maxskysql -passwd=skysql +password=skysql max_slave_connections=100% router_options=slave_selection_criteria=LEAST_CURRENT_OPERATIONS @@ -24,7 +24,7 @@ router=readconnroute router_options= slave servers=server1,server2,server3,server4 user=maxskysql -passwd=skysql +password=skysql [Read Connection Router Master] type=service @@ -32,7 +32,7 @@ router=readconnroute router_options=master servers=server1,server2,server3,server4 user=maxskysql -passwd=skysql +password=skysql [RW Split Listener] type=listener diff --git a/maxscale-system-test/cnf/maxscale.cnf.template.local_address b/maxscale-system-test/cnf/maxscale.cnf.template.local_address index af1ab0b0b..485898a41 100644 --- a/maxscale-system-test/cnf/maxscale.cnf.template.local_address +++ b/maxscale-system-test/cnf/maxscale.cnf.template.local_address @@ -7,7 +7,7 @@ type=monitor module=mysqlmon servers=server1,server2,server3,server4 user=maxskysql -passwd=skysql +password=skysql monitor_interval=1000 detect_stale_master=false @@ -16,7 +16,7 @@ type=service router=readwritesplit servers=server1,server2,server3,server4 user=maxskysql -passwd=skysql +password=skysql router_options=slave_selection_criteria=LEAST_GLOBAL_CONNECTIONS max_slave_connections=1 @@ -26,7 +26,7 @@ router=readconnroute router_options=slave servers=server1,server2,server3,server4 user=maxskysql -passwd=skysql +password=skysql [Read Connection Router Master] type=service @@ -34,7 +34,7 @@ router=readconnroute router_options=master servers=server1,server2,server3,server4 user=maxskysql -passwd=skysql +password=skysql [RW Split Listener] type=listener diff --git a/maxscale-system-test/cnf/maxscale.cnf.template.longblob b/maxscale-system-test/cnf/maxscale.cnf.template.longblob index 86ff6d6b5..6416079af 100755 --- a/maxscale-system-test/cnf/maxscale.cnf.template.longblob +++ b/maxscale-system-test/cnf/maxscale.cnf.template.longblob @@ -7,7 +7,7 @@ type=monitor module=mysqlmon servers= server1, server2,server3 ,server4 user=maxskysql -passwd= skysql +password= skysql monitor_interval=1000 backend_connect_timeout=10 backend_read_timeout=10 @@ -17,7 +17,7 @@ type=service router= readwritesplit servers=server1, server2, server3,server4 user=maxskysql -passwd=skysql +password=skysql router_options=slave_selection_criteria=LEAST_ROUTER_CONNECTIONS max_slave_connections=1 @@ -27,7 +27,7 @@ router=readconnroute router_options= slave servers=server1,server2,server3,server4 user=maxskysql -passwd=skysql +password=skysql [Read Connection Router Master] type=service @@ -35,7 +35,7 @@ router=readconnroute router_options=master servers=server1,server2,server3,server4 user=maxskysql -passwd=skysql +password=skysql [RW Split Listener] type=listener diff --git a/maxscale-system-test/cnf/maxscale.cnf.template.longblob_filters b/maxscale-system-test/cnf/maxscale.cnf.template.longblob_filters index 24d4f9c26..ab2e4e80f 100755 --- a/maxscale-system-test/cnf/maxscale.cnf.template.longblob_filters +++ b/maxscale-system-test/cnf/maxscale.cnf.template.longblob_filters @@ -7,7 +7,7 @@ type=monitor module=mysqlmon servers= server1, server2,server3 ,server4 user=maxskysql -passwd= skysql +password= skysql monitor_interval=1000 backend_connect_timeout=10 backend_read_timeout=10 @@ -17,7 +17,7 @@ type=service router= readwritesplit servers=server1, server2, server3,server4 user=maxskysql -passwd=skysql +password=skysql router_options=slave_selection_criteria=LEAST_ROUTER_CONNECTIONS max_slave_connections=1 #filters=duplicate|hints|regex|ccrfilter|MaxRows|Masking|Cache|namedserverfilter|Database Firewall @@ -31,7 +31,7 @@ router=readconnroute router_options= slave servers=server1,server2,server3,server4 user=maxskysql -passwd=skysql +password=skysql [Read Connection Router Master] type=service @@ -39,7 +39,7 @@ router=readconnroute router_options=master servers=server1,server2,server3,server4 user=maxskysql -passwd=skysql +password=skysql [RW Split Listener] type=listener @@ -160,7 +160,7 @@ type=monitor module=galeramon servers=gserver1,gserver2,gserver3,gserver4 user=maxskysql -passwd=skysql +password=skysql monitor_interval=100 root_node_as_master=false @@ -169,7 +169,7 @@ type=service router= readwritesplit servers=gserver1,gserver2,gserver3,gserver4 user=maxskysql -passwd=skysql +password=skysql router_options=slave_selection_criteria=LEAST_ROUTER_CONNECTIONS [RW Split Listener Galera] diff --git a/maxscale-system-test/cnf/maxscale.cnf.template.masking_mysqltest b/maxscale-system-test/cnf/maxscale.cnf.template.masking_mysqltest index e82192246..f90182ea2 100644 --- a/maxscale-system-test/cnf/maxscale.cnf.template.masking_mysqltest +++ b/maxscale-system-test/cnf/maxscale.cnf.template.masking_mysqltest @@ -7,7 +7,7 @@ type=monitor module=mysqlmon servers=server1,server2,server3,server4 user=maxskysql -passwd= skysql +password= skysql monitor_interval=1000 detect_stale_master=false @@ -16,7 +16,7 @@ type=service router= readwritesplit servers=server1,server2,server3,server4 user=maxskysql -passwd=skysql +password=skysql router_options=slave_selection_criteria=LEAST_GLOBAL_CONNECTIONS max_slave_connections=1 @@ -26,7 +26,7 @@ router=readconnroute router_options= slave servers=server1,server2,server3,server4 user=maxskysql -passwd=skysql +password=skysql [Read Connection Router Master] type=service @@ -34,7 +34,7 @@ router=readconnroute router_options=master servers=server1,server2,server3,server4 user=maxskysql -passwd=skysql +password=skysql filters=Masking [RW Split Listener] diff --git a/maxscale-system-test/cnf/maxscale.cnf.template.master_only b/maxscale-system-test/cnf/maxscale.cnf.template.master_only index b1c91b7c7..15f883b81 100755 --- a/maxscale-system-test/cnf/maxscale.cnf.template.master_only +++ b/maxscale-system-test/cnf/maxscale.cnf.template.master_only @@ -7,7 +7,7 @@ type=monitor module=mysqlmon servers= server1 user=maxskysql -passwd= skysql +password= skysql monitor_interval=1000 [RW Split Router] @@ -15,7 +15,7 @@ type=service router= readwritesplit servers=server1 user=maxskysql -passwd=skysql +password=skysql router_options=slave_selection_criteria=LEAST_GLOBAL_CONNECTIONS max_slave_connections=1 @@ -25,7 +25,7 @@ router=readconnroute router_options= slave servers=server1 user=maxskysql -passwd=skysql +password=skysql [Read Connection Router Master] type=service @@ -33,7 +33,7 @@ router=readconnroute router_options=master servers=server1 user=maxskysql -passwd=skysql +password=skysql [RW Split Listener] type=listener diff --git a/maxscale-system-test/cnf/maxscale.cnf.template.maxinfo b/maxscale-system-test/cnf/maxscale.cnf.template.maxinfo index ca277fde2..b30571925 100644 --- a/maxscale-system-test/cnf/maxscale.cnf.template.maxinfo +++ b/maxscale-system-test/cnf/maxscale.cnf.template.maxinfo @@ -5,7 +5,7 @@ threads=4 type=service router=maxinfo user=maxuser -passwd=maxpwd +password=maxpwd [Maxinfo SQL Listener] type=listener @@ -24,7 +24,7 @@ type=monitor module=mysqlmon servers=server1,server2,server3,server4 user=maxuser -passwd=maxpwd +password=maxpwd monitor_interval=10000 [RW Split Router] @@ -32,7 +32,7 @@ type=service router= readwritesplit servers=server1,server2,server3,server4 user=maxskysql -passwd=skysql +password=skysql router_options=slave_selection_criteria=LEAST_GLOBAL_CONNECTIONS max_slave_connections=1 @@ -42,7 +42,7 @@ router=readconnroute router_options= slave servers=server1,server2,server3,server4 user=maxskysql -passwd=skysql +password=skysql [Read Connection Router Master] type=service @@ -50,7 +50,7 @@ router=readconnroute router_options=master servers=server1,server2,server3,server4 user=maxskysql -passwd=skysql +password=skysql [RW Split Listener] type=listener diff --git a/maxscale-system-test/cnf/maxscale.cnf.template.maxinfo_sql b/maxscale-system-test/cnf/maxscale.cnf.template.maxinfo_sql index 1def8d09f..b20059e11 100644 --- a/maxscale-system-test/cnf/maxscale.cnf.template.maxinfo_sql +++ b/maxscale-system-test/cnf/maxscale.cnf.template.maxinfo_sql @@ -30,14 +30,14 @@ type=monitor module=mysqlmon servers=server1,server2,server3,server4 user=maxskysql -passwd=skysql +password=skysql monitor_interval=1000 [Maxinfo] type=service router=maxinfo user=maxuser -passwd=maxpwd +password=maxpwd # Added here to allow users to be fetched from the backend server servers=server1 @@ -52,7 +52,7 @@ type=service router=readwritesplit servers=server1,server2,server3,server4 user=maxskysql -passwd=skysql +password=skysql [RW Split Listener] type=listener diff --git a/maxscale-system-test/cnf/maxscale.cnf.template.maxpasswd b/maxscale-system-test/cnf/maxscale.cnf.template.maxpasswd index f3a313728..7fa122ec5 100755 --- a/maxscale-system-test/cnf/maxscale.cnf.template.maxpasswd +++ b/maxscale-system-test/cnf/maxscale.cnf.template.maxpasswd @@ -7,7 +7,7 @@ type=monitor module=mysqlmon servers= server1, server2,server3 ,server4 user=maxskysql -passwd=skysql +password=skysql monitor_interval=1000 detect_stale_master=false @@ -16,7 +16,7 @@ type=service router= readwritesplit servers=server1, server2, server3,server4 user=maxskysql -passwd=skysql +password=skysql router_options=slave_selection_criteria=LEAST_GLOBAL_CONNECTIONS max_slave_connections=1 @@ -26,7 +26,7 @@ router=readconnroute router_options= slave servers=server1,server2,server3,server4 user=maxskysql -passwd=skysql +password=skysql [Read Connection Router Master] type=service @@ -34,7 +34,7 @@ router=readconnroute router_options=master servers=server1,server2,server3,server4 user=maxskysql -passwd=skysql +password=skysql [RW Split Listener] type=listener diff --git a/maxscale-system-test/cnf/maxscale.cnf.template.maxrows b/maxscale-system-test/cnf/maxscale.cnf.template.maxrows index 00abee5f3..8de058a57 100755 --- a/maxscale-system-test/cnf/maxscale.cnf.template.maxrows +++ b/maxscale-system-test/cnf/maxscale.cnf.template.maxrows @@ -7,7 +7,7 @@ type=monitor module=mysqlmon servers= server1, server2,server3 ,server4 user=maxskysql -passwd= skysql +password= skysql monitor_interval=1000 detect_stale_master=false @@ -16,7 +16,7 @@ type=service router= readwritesplit servers=server1, server2, server3,server4 user=maxskysql -passwd=skysql +password=skysql router_options=slave_selection_criteria=LEAST_GLOBAL_CONNECTIONS max_slave_connections=1 filters=MaxRows @@ -27,7 +27,7 @@ router=readconnroute router_options= slave servers=server1,server2,server3,server4 user=maxskysql -passwd=skysql +password=skysql [Read Connection Router Master] type=service @@ -35,7 +35,7 @@ router=readconnroute router_options=master servers=server1,server2,server3,server4 user=maxskysql -passwd=skysql +password=skysql [RW Split Listener] type=listener diff --git a/maxscale-system-test/cnf/maxscale.cnf.template.mm b/maxscale-system-test/cnf/maxscale.cnf.template.mm index d7ad51c4d..d337c6c74 100755 --- a/maxscale-system-test/cnf/maxscale.cnf.template.mm +++ b/maxscale-system-test/cnf/maxscale.cnf.template.mm @@ -7,7 +7,7 @@ type=monitor module=mmmon servers= server1, server2 user=maxskysql -passwd= skysql +password= skysql detect_stale_master=0 monitor_interval=1000 @@ -16,7 +16,7 @@ type=service router= readwritesplit servers=server1, server2 user=maxskysql -passwd=skysql +password=skysql router_options=slave_selection_criteria=LEAST_ROUTER_CONNECTIONS [Read Connection Router Slave] @@ -25,7 +25,7 @@ router=readconnroute router_options= slave servers=server1,server2 user=maxskysql -passwd=skysql +password=skysql [Read Connection Router Master] type=service @@ -33,7 +33,7 @@ router=readconnroute router_options=master servers=server1,server2 user=maxskysql -passwd=skysql +password=skysql [RW Split Listener] type=listener diff --git a/maxscale-system-test/cnf/maxscale.cnf.template.mm_mysqlmon b/maxscale-system-test/cnf/maxscale.cnf.template.mm_mysqlmon index f8a49d36f..9c906f51d 100644 --- a/maxscale-system-test/cnf/maxscale.cnf.template.mm_mysqlmon +++ b/maxscale-system-test/cnf/maxscale.cnf.template.mm_mysqlmon @@ -7,7 +7,7 @@ type=monitor module=mysqlmon servers= server1, server2, server3, server4 user=maxskysql -passwd= skysql +password= skysql detect_stale_master=0 monitor_interval=1000 multimaster=true @@ -17,7 +17,7 @@ type=service router= readwritesplit servers=server1, server2, server3, server4 user=maxskysql -passwd=skysql +password=skysql router_options=slave_selection_criteria=LEAST_ROUTER_CONNECTIONS [Read Connection Router Slave] @@ -26,7 +26,7 @@ router=readconnroute router_options= slave servers=server1,server2 user=maxskysql -passwd=skysql +password=skysql [Read Connection Router Master] type=service @@ -34,7 +34,7 @@ router=readconnroute router_options=master servers=server1,server2 user=maxskysql -passwd=skysql +password=skysql [RW Split Listener] type=listener diff --git a/maxscale-system-test/cnf/maxscale.cnf.template.mxs1045 b/maxscale-system-test/cnf/maxscale.cnf.template.mxs1045 index 4e1ea2953..6a8d54c62 100644 --- a/maxscale-system-test/cnf/maxscale.cnf.template.mxs1045 +++ b/maxscale-system-test/cnf/maxscale.cnf.template.mxs1045 @@ -7,7 +7,7 @@ type=monitor module=mysqlmon servers= server1,server2,server3 ,server4 user=maxskysql -passwd= skysql +password= skysql monitor_interval=1000 detect_stale_master=false script=/bin/sh -c "echo hello world!" @@ -18,7 +18,7 @@ type=service router= readwritesplit servers=server1,server2,server3,server4 user=maxskysql -passwd=skysql +password=skysql router_options=slave_selection_criteria=LEAST_GLOBAL_CONNECTIONS max_slave_connections=1 @@ -28,7 +28,7 @@ router=readconnroute router_options= slave servers=server1,server2,server3,server4 user=maxskysql -passwd=skysql +password=skysql [Read Connection Router Master] type=service @@ -36,7 +36,7 @@ router=readconnroute router_options=master servers=server1,server2,server3,server4 user=maxskysql -passwd=skysql +password=skysql [RW Split Listener] type=listener diff --git a/maxscale-system-test/cnf/maxscale.cnf.template.mxs1123 b/maxscale-system-test/cnf/maxscale.cnf.template.mxs1123 index bb2fc9a06..4fb2b4653 100644 --- a/maxscale-system-test/cnf/maxscale.cnf.template.mxs1123 +++ b/maxscale-system-test/cnf/maxscale.cnf.template.mxs1123 @@ -7,7 +7,7 @@ type=monitor module=mysqlmon servers=server1,server2,server3,server4 user=maxskysql -passwd=skysql +password=skysql monitor_interval=1000 detect_stale_master=false @@ -16,7 +16,7 @@ type=service router=readwritesplit servers=server1,server2,server3,server4 user=maxskysql -passwd=skysql +password=skysql connection_timeout=60 [Read Connection Router Slave] @@ -25,7 +25,7 @@ router=readconnroute router_options=slave servers=server1,server2,server3,server4 user=maxskysql -passwd=skysql +password=skysql [Read Connection Router Master] type=service @@ -33,7 +33,7 @@ router=readconnroute router_options=master servers=server1,server2,server3,server4 user=maxskysql -passwd=skysql +password=skysql [RW Split Listener] type=listener diff --git a/maxscale-system-test/cnf/maxscale.cnf.template.mxs118 b/maxscale-system-test/cnf/maxscale.cnf.template.mxs118 index 459f37d15..9839c2574 100755 --- a/maxscale-system-test/cnf/maxscale.cnf.template.mxs118 +++ b/maxscale-system-test/cnf/maxscale.cnf.template.mxs118 @@ -7,14 +7,14 @@ type=monitor module=mysqlmon servers= server1, server2,server3 ,server4 user=maxskysql -passwd= skysql +password= skysql [MySQL Monitor 1] type=monitor module=galeramon servers= server1, server2,server3 ,server4 user=maxskysql -passwd= skysql +password= skysql root_node_as_master=false [RW Split Router] @@ -22,7 +22,7 @@ type=service router= readwritesplit servers=server1, server2, server3,server4 user=maxskysql -passwd=skysql +password=skysql router_options=slave_selection_criteria=LEAST_ROUTER_CONNECTIONS [Read Connection Router Slave] @@ -31,7 +31,7 @@ router=readconnroute router_options= slave servers=server1,server2,server3,server4 user=maxskysql -passwd=skysql +password=skysql [Read Connection Router Master] type=service @@ -39,7 +39,7 @@ router=readconnroute router_options=master servers=server1,server2,server3,server4 user=maxskysql -passwd=skysql +password=skysql [RW Split Listener] type=listener diff --git a/maxscale-system-test/cnf/maxscale.cnf.template.mxs127 b/maxscale-system-test/cnf/maxscale.cnf.template.mxs127 index d351158cc..d7c5760e3 100755 --- a/maxscale-system-test/cnf/maxscale.cnf.template.mxs127 +++ b/maxscale-system-test/cnf/maxscale.cnf.template.mxs127 @@ -7,14 +7,14 @@ type=monitor module=mysqlmon servers= server1, server2,server3 ,server4 user=maxskysql -passwd= skysql +password= skysql [RW Split Router] type=service router= readwritesplit servers=server1, server2, server3,server4 user=maxskysql -passwd=skysql +password=skysql router_options=slave_selection_criteria=LEAST_ROUTER_CONNECTIONS,disable_sescmd_history=YES [Read Connection Router Slave] @@ -23,7 +23,7 @@ router=readconnroute router_options= slave servers=server1,server2,server3,server4 user=maxskysql -passwd=skysql +password=skysql [Read Connection Router Master] type=service @@ -31,7 +31,7 @@ router=readconnroute router_options=master servers=server1,server2,server3,server4 user=maxskysql -passwd=skysql +password=skysql [RW Split Listener] type=listener diff --git a/maxscale-system-test/cnf/maxscale.cnf.template.mxs1295 b/maxscale-system-test/cnf/maxscale.cnf.template.mxs1295 index 3b864839c..fb2fba77c 100644 --- a/maxscale-system-test/cnf/maxscale.cnf.template.mxs1295 +++ b/maxscale-system-test/cnf/maxscale.cnf.template.mxs1295 @@ -6,7 +6,7 @@ type=monitor module=mysqlmon servers=server1,server2 user=maxskysql -passwd=skysql +password=skysql monitor_interval=1000 [RW Split Router] @@ -14,7 +14,7 @@ type=service router=readwritesplit servers=server1,server2 user=maxskysql -passwd=skysql +password=skysql strict_multi_stmt=false strict_sp_calls=true diff --git a/maxscale-system-test/cnf/maxscale.cnf.template.mxs1310_implicit_db b/maxscale-system-test/cnf/maxscale.cnf.template.mxs1310_implicit_db index eceed0afc..8737dd414 100644 --- a/maxscale-system-test/cnf/maxscale.cnf.template.mxs1310_implicit_db +++ b/maxscale-system-test/cnf/maxscale.cnf.template.mxs1310_implicit_db @@ -7,14 +7,14 @@ type=monitor module=mysqlmon servers=server1,server2 user=maxskysql -passwd=skysql +password=skysql [Sharding router] type=service router=schemarouter servers=server1,server2 user=maxskysql -passwd=skysql +password=skysql auth_all_servers=1 ignore_databases_regex=.* diff --git a/maxscale-system-test/cnf/maxscale.cnf.template.mxs1323 b/maxscale-system-test/cnf/maxscale.cnf.template.mxs1323 index fdc311c3a..e5caa9257 100644 --- a/maxscale-system-test/cnf/maxscale.cnf.template.mxs1323 +++ b/maxscale-system-test/cnf/maxscale.cnf.template.mxs1323 @@ -9,7 +9,7 @@ type=monitor module=mysqlmon servers= server1,server2 user=maxskysql -passwd= skysql +password= skysql monitor_interval=1000 backend_read_timeout=1 backend_connect_timeout=1 @@ -19,7 +19,7 @@ type=service router= readwritesplit servers=server1,server2 user=maxskysql -passwd=skysql +password=skysql [RW Split Listener] type=listener diff --git a/maxscale-system-test/cnf/maxscale.cnf.template.mxs1451_skip_auth b/maxscale-system-test/cnf/maxscale.cnf.template.mxs1451_skip_auth index 6203bd0f6..5e9895026 100644 --- a/maxscale-system-test/cnf/maxscale.cnf.template.mxs1451_skip_auth +++ b/maxscale-system-test/cnf/maxscale.cnf.template.mxs1451_skip_auth @@ -6,7 +6,7 @@ type=monitor module=mysqlmon servers=server1,server2,server3,server4 user=maxskysql -passwd=skysql +password=skysql monitor_interval=1000 [RW Split Router] @@ -14,7 +14,7 @@ type=service router=readwritesplit servers=server1,server2,server3,server4 user=maxskysql -passwd=skysql +password=skysql [Read Connection Router Slave] type=service @@ -22,7 +22,7 @@ router=readconnroute router_options=slave servers=server1,server2,server3,server4 user=maxskysql -passwd=skysql +password=skysql [Read Connection Router Master] type=service @@ -30,7 +30,7 @@ router=readconnroute router_options=master servers=server1,server2,server3,server4 user=maxskysql -passwd=skysql +password=skysql [RW Split Listener] type=listener diff --git a/maxscale-system-test/cnf/maxscale.cnf.template.mxs1457_ignore_deleted b/maxscale-system-test/cnf/maxscale.cnf.template.mxs1457_ignore_deleted index 039f812c8..6738f4a12 100644 --- a/maxscale-system-test/cnf/maxscale.cnf.template.mxs1457_ignore_deleted +++ b/maxscale-system-test/cnf/maxscale.cnf.template.mxs1457_ignore_deleted @@ -7,7 +7,7 @@ type=monitor module=mysqlmon servers=server1,server2,server3,server4 user=maxskysql -passwd=skysql +password=skysql monitor_interval=1000 [RW Split Router] @@ -15,7 +15,7 @@ type=service router=readwritesplit servers=server1,server2,server3,server4 user=maxskysql -passwd=skysql +password=skysql router_options=master_failure_mode=error_on_write [RW Split Listener] diff --git a/maxscale-system-test/cnf/maxscale.cnf.template.mxs1468 b/maxscale-system-test/cnf/maxscale.cnf.template.mxs1468 index e395186fe..fa32b8f19 100755 --- a/maxscale-system-test/cnf/maxscale.cnf.template.mxs1468 +++ b/maxscale-system-test/cnf/maxscale.cnf.template.mxs1468 @@ -5,7 +5,7 @@ threads=###threads### type=service router=readwritesplit user=maxskysql -passwd=skysql +password=skysql [CLI] type=service diff --git a/maxscale-system-test/cnf/maxscale.cnf.template.mxs1476 b/maxscale-system-test/cnf/maxscale.cnf.template.mxs1476 index 668a3fc83..14cc7a72c 100644 --- a/maxscale-system-test/cnf/maxscale.cnf.template.mxs1476 +++ b/maxscale-system-test/cnf/maxscale.cnf.template.mxs1476 @@ -7,7 +7,7 @@ type=monitor module=galeramon servers=server1,server2 user=maxskysql -passwd=skysql +password=skysql monitor_interval=1000 root_node_as_master=false use_priority=true @@ -19,7 +19,7 @@ type=service router=readwritesplit servers=server1,server2 user=maxskysql -passwd=skysql +password=skysql [RW Split Listener] type=listener diff --git a/maxscale-system-test/cnf/maxscale.cnf.template.mxs1503_extra_slaves b/maxscale-system-test/cnf/maxscale.cnf.template.mxs1503_extra_slaves index 701f7cf95..4911016ac 100644 --- a/maxscale-system-test/cnf/maxscale.cnf.template.mxs1503_extra_slaves +++ b/maxscale-system-test/cnf/maxscale.cnf.template.mxs1503_extra_slaves @@ -6,7 +6,7 @@ type=monitor module=mysqlmon servers=server1,server2,server3,server4 user=maxskysql -passwd=skysql +password=skysql monitor_interval=1000 [RW Split Router] @@ -14,7 +14,7 @@ type=service router=readwritesplit servers=server1,server2,server3,server4 user=maxskysql -passwd=skysql +password=skysql max_slave_connections=1 [RW Split Listener] diff --git a/maxscale-system-test/cnf/maxscale.cnf.template.mxs1503_master_reconnection b/maxscale-system-test/cnf/maxscale.cnf.template.mxs1503_master_reconnection index a763720ab..4a993ca98 100755 --- a/maxscale-system-test/cnf/maxscale.cnf.template.mxs1503_master_reconnection +++ b/maxscale-system-test/cnf/maxscale.cnf.template.mxs1503_master_reconnection @@ -6,7 +6,7 @@ type=monitor module=mysqlmon servers=server1,server2,server3,server4 user=maxskysql -passwd=skysql +password=skysql monitor_interval=1000 [RW Split Router] @@ -14,7 +14,7 @@ type=service router=readwritesplit servers=server1,server2,server3,server4 user=maxskysql -passwd=skysql +password=skysql master_failure_mode=error_on_write master_reconnection=true diff --git a/maxscale-system-test/cnf/maxscale.cnf.template.mxs1506_delayed_retry b/maxscale-system-test/cnf/maxscale.cnf.template.mxs1506_delayed_retry index 2f42ced04..b42557ba0 100644 --- a/maxscale-system-test/cnf/maxscale.cnf.template.mxs1506_delayed_retry +++ b/maxscale-system-test/cnf/maxscale.cnf.template.mxs1506_delayed_retry @@ -7,7 +7,7 @@ type=monitor module=mysqlmon servers=server1,server2 user=maxskysql -passwd=skysql +password=skysql monitor_interval=1000 backend_read_timeout=1 backend_connect_timeout=1 @@ -17,7 +17,7 @@ type=service router=readwritesplit servers=server1,server2 user=maxskysql -passwd=skysql +password=skysql master_failure_mode=fail_on_write master_reconnection=true delayed_retry=true diff --git a/maxscale-system-test/cnf/maxscale.cnf.template.mxs1507_trx_replay b/maxscale-system-test/cnf/maxscale.cnf.template.mxs1507_trx_replay index d64d023ff..11f3de9de 100644 --- a/maxscale-system-test/cnf/maxscale.cnf.template.mxs1507_trx_replay +++ b/maxscale-system-test/cnf/maxscale.cnf.template.mxs1507_trx_replay @@ -7,7 +7,7 @@ type=monitor module=mysqlmon servers=server1,server2,server3,server4 user=maxskysql -passwd=skysql +password=skysql monitor_interval=1000 [RW Split Router] @@ -15,7 +15,7 @@ type=service router=readwritesplit servers=server1,server2,server3,server4 user=maxskysql -passwd=skysql +password=skysql transaction_replay=true transaction_replay_max_size=200 diff --git a/maxscale-system-test/cnf/maxscale.cnf.template.mxs1507_trx_stress b/maxscale-system-test/cnf/maxscale.cnf.template.mxs1507_trx_stress index b3d120c27..86e059b0f 100644 --- a/maxscale-system-test/cnf/maxscale.cnf.template.mxs1507_trx_stress +++ b/maxscale-system-test/cnf/maxscale.cnf.template.mxs1507_trx_stress @@ -7,7 +7,7 @@ type=monitor module=mysqlmon servers=server1,server2,server3,server4 user=maxskysql -passwd=skysql +password=skysql monitor_interval=1000 backend_connect_timeout=1 backend_read_timeout=1 @@ -18,7 +18,7 @@ type=service router=readwritesplit servers=server1,server2,server3,server4 user=maxskysql -passwd=skysql +password=skysql transaction_replay=true delayed_retry_timeout=30 diff --git a/maxscale-system-test/cnf/maxscale.cnf.template.mxs1509 b/maxscale-system-test/cnf/maxscale.cnf.template.mxs1509 index 4fa92207d..9ff53ed90 100644 --- a/maxscale-system-test/cnf/maxscale.cnf.template.mxs1509 +++ b/maxscale-system-test/cnf/maxscale.cnf.template.mxs1509 @@ -6,7 +6,7 @@ type=monitor module=mysqlmon servers=server1,server2 user=maxskysql -passwd=skysql +password=skysql monitor_interval=1000 ignore_external_masters=true @@ -15,7 +15,7 @@ type=service router=readwritesplit servers=server1,server2 user=maxskysql -passwd=skysql +password=skysql [RW Split Listener] type=listener diff --git a/maxscale-system-test/cnf/maxscale.cnf.template.mxs1549_optimistic_trx b/maxscale-system-test/cnf/maxscale.cnf.template.mxs1549_optimistic_trx index 35eda64c6..28f25bd62 100644 --- a/maxscale-system-test/cnf/maxscale.cnf.template.mxs1549_optimistic_trx +++ b/maxscale-system-test/cnf/maxscale.cnf.template.mxs1549_optimistic_trx @@ -19,7 +19,7 @@ type=monitor module=mysqlmon servers=server1,server2 user=maxskysql -passwd=skysql +password=skysql monitor_interval=1000 [RW Split Router] @@ -27,7 +27,7 @@ type=service router=readwritesplit servers=server1,server2 user=maxskysql -passwd=skysql +password=skysql optimistic_trx=true master_failure_mode=fail_on_write diff --git a/maxscale-system-test/cnf/maxscale.cnf.template.mxs1583_fwf b/maxscale-system-test/cnf/maxscale.cnf.template.mxs1583_fwf index 7a0d19549..7153f8b7f 100644 --- a/maxscale-system-test/cnf/maxscale.cnf.template.mxs1583_fwf +++ b/maxscale-system-test/cnf/maxscale.cnf.template.mxs1583_fwf @@ -7,7 +7,7 @@ type=monitor module=mysqlmon servers=server1 user=maxskysql -passwd=skysql +password=skysql monitor_interval=100 [Database Firewall] @@ -22,7 +22,7 @@ type=service router=readconnroute servers=server1 user=maxskysql -passwd=skysql +password=skysql filters=Database Firewall [Read Connection Router Slave] @@ -31,7 +31,7 @@ router=readconnroute router_options=slave servers=server1 user=maxskysql -passwd=skysql +password=skysql [Read Connection Router Master] type=service @@ -39,7 +39,7 @@ router=readconnroute router_options=master servers=server1 user=maxskysql -passwd=skysql +password=skysql [RW Split Listener] type=listener diff --git a/maxscale-system-test/cnf/maxscale.cnf.template.mxs1585 b/maxscale-system-test/cnf/maxscale.cnf.template.mxs1585 index 71569f5c9..fad8a1c2d 100755 --- a/maxscale-system-test/cnf/maxscale.cnf.template.mxs1585 +++ b/maxscale-system-test/cnf/maxscale.cnf.template.mxs1585 @@ -6,7 +6,7 @@ type=monitor module=galeramon servers=server1,server2,server3,server4 user=maxskysql -passwd=skysql +password=skysql monitor_interval=1000 root_node_as_master=false @@ -15,7 +15,7 @@ type=service router=readwritesplit servers=server1,server2,server3,server4 user=maxskysql -passwd=skysql +password=skysql master_failure_mode=fail_on_write [Read Connection Router Slave] @@ -24,7 +24,7 @@ router=readconnroute router_options=slave servers=server1,server2,server3,server4 user=maxskysql -passwd=skysql +password=skysql [Read Connection Router Master] type=service @@ -32,7 +32,7 @@ router=readconnroute router_options=master servers=server1,server2,server3,server4 user=maxskysql -passwd=skysql +password=skysql [RW Split Listener] type=listener diff --git a/maxscale-system-test/cnf/maxscale.cnf.template.mxs1643_extra_events b/maxscale-system-test/cnf/maxscale.cnf.template.mxs1643_extra_events index 70201df8b..784d0f842 100644 --- a/maxscale-system-test/cnf/maxscale.cnf.template.mxs1643_extra_events +++ b/maxscale-system-test/cnf/maxscale.cnf.template.mxs1643_extra_events @@ -6,7 +6,7 @@ type=monitor module=mysqlmon servers= server1,server2,server3,server4 user=maxskysql -passwd= skysql +password= skysql monitor_interval=1000 [RW Split Router] @@ -14,7 +14,7 @@ type=service router= readwritesplit servers=server1,server2,server3,server4 user=maxskysql -passwd=skysql +password=skysql [RW Split Listener] type=listener diff --git a/maxscale-system-test/cnf/maxscale.cnf.template.mxs1713_lots_of_databases b/maxscale-system-test/cnf/maxscale.cnf.template.mxs1713_lots_of_databases index e85a7b884..41d0a9515 100644 --- a/maxscale-system-test/cnf/maxscale.cnf.template.mxs1713_lots_of_databases +++ b/maxscale-system-test/cnf/maxscale.cnf.template.mxs1713_lots_of_databases @@ -6,14 +6,14 @@ type=monitor module=mysqlmon servers=server1 user=maxskysql -passwd=skysql +password=skysql [Sharding router] type=service router=schemarouter servers=server1 user=maxskysql -passwd=skysql +password=skysql [Sharding Listener] type=listener diff --git a/maxscale-system-test/cnf/maxscale.cnf.template.mxs1719 b/maxscale-system-test/cnf/maxscale.cnf.template.mxs1719 index b06abac51..4d8bbf674 100644 --- a/maxscale-system-test/cnf/maxscale.cnf.template.mxs1719 +++ b/maxscale-system-test/cnf/maxscale.cnf.template.mxs1719 @@ -14,7 +14,7 @@ type=monitor module=mysqlmon servers=server1 user=maxskysql -passwd=skysql +password=skysql monitor_interval=1000 [Masking] @@ -29,7 +29,7 @@ type=service router=readwritesplit servers=server1 user=maxskysql -passwd=skysql +password=skysql filters=Masking [RWS-Listener] diff --git a/maxscale-system-test/cnf/maxscale.cnf.template.mxs1731_empty_param b/maxscale-system-test/cnf/maxscale.cnf.template.mxs1731_empty_param index 71ebb7e31..43352ba09 100644 --- a/maxscale-system-test/cnf/maxscale.cnf.template.mxs1731_empty_param +++ b/maxscale-system-test/cnf/maxscale.cnf.template.mxs1731_empty_param @@ -30,7 +30,7 @@ type=monitor module=mysqlmon servers=server1,server2,server3,server4 user=maxskysql -passwd=skysql +password=skysql monitor_interval=1000 [RW Split Router] @@ -38,7 +38,7 @@ type=service router=readwritesplit servers=server1,server2,server3,server4 user=maxskysql -passwd=skysql +password=skysql version_string= [RW Split Listener] diff --git a/maxscale-system-test/cnf/maxscale.cnf.template.mxs173_throttle_filter b/maxscale-system-test/cnf/maxscale.cnf.template.mxs173_throttle_filter index c0331c5c2..0ac5943e0 100644 --- a/maxscale-system-test/cnf/maxscale.cnf.template.mxs173_throttle_filter +++ b/maxscale-system-test/cnf/maxscale.cnf.template.mxs173_throttle_filter @@ -7,7 +7,7 @@ type = monitor module = mariadbmon servers = server1,server2,server3,server4 user = maxskysql -passwd = skysql +password = skysql monitor_interval = 5000 auto_failover = 1 @@ -16,7 +16,7 @@ type = service router = readwritesplit servers = server1,server2,server3,server4 user = maxskysql -passwd = skysql +password = skysql filters = throttle [RW-Split-Listener] @@ -31,7 +31,7 @@ router = readconnroute router_options = master servers = server1,server2,server3,server4 user = maxskysql -passwd = skysql +password = skysql [Read-Connection-Listener-Master] type = listener @@ -45,7 +45,7 @@ router = readconnroute router_options = slave servers = server1,server2,server3,server4 user = maxskysql -passwd = skysql +password = skysql [Read-Connection-Listener-Slave] type = listener diff --git a/maxscale-system-test/cnf/maxscale.cnf.template.mxs1743_rconn_bitmask b/maxscale-system-test/cnf/maxscale.cnf.template.mxs1743_rconn_bitmask index fa23d654e..22bde2958 100644 --- a/maxscale-system-test/cnf/maxscale.cnf.template.mxs1743_rconn_bitmask +++ b/maxscale-system-test/cnf/maxscale.cnf.template.mxs1743_rconn_bitmask @@ -6,7 +6,7 @@ type=monitor module=mysqlmon servers=server1,server2 user=maxskysql -passwd=skysql +password=skysql monitor_interval=1000 [Read Connection Router Master] @@ -15,7 +15,7 @@ router=readconnroute router_options=master,slave servers=server1,server2 user=maxskysql -passwd=skysql +password=skysql [Read Connection Listener Master] type=listener diff --git a/maxscale-system-test/cnf/maxscale.cnf.template.mxs1751_available_when_donor_crash b/maxscale-system-test/cnf/maxscale.cnf.template.mxs1751_available_when_donor_crash index 39cc92b9c..246e28397 100755 --- a/maxscale-system-test/cnf/maxscale.cnf.template.mxs1751_available_when_donor_crash +++ b/maxscale-system-test/cnf/maxscale.cnf.template.mxs1751_available_when_donor_crash @@ -6,7 +6,7 @@ type=monitor module=galeramon servers=server1,server2,server3 user=maxskysql -passwd=skysql +password=skysql monitor_interval=100 available_when_donor=true @@ -15,7 +15,7 @@ type=service router=readwritesplit servers=server1,server2,server3 user=maxskysql -passwd=skysql +password=skysql master_accept_reads=true [RW Split Listener] diff --git a/maxscale-system-test/cnf/maxscale.cnf.template.mxs1778_causal_reads b/maxscale-system-test/cnf/maxscale.cnf.template.mxs1778_causal_reads index e8ef83c4b..001aefda7 100644 --- a/maxscale-system-test/cnf/maxscale.cnf.template.mxs1778_causal_reads +++ b/maxscale-system-test/cnf/maxscale.cnf.template.mxs1778_causal_reads @@ -6,7 +6,7 @@ type=monitor module=mysqlmon servers=server1,server2,server3,server4 user=maxskysql -passwd=skysql +password=skysql monitor_interval=1000 [RW Split Router] @@ -14,7 +14,7 @@ type=service router=readwritesplit servers=server1,server2,server3,server4 user=maxskysql -passwd=skysql +password=skysql causal_reads=true [RW Split Listener] diff --git a/maxscale-system-test/cnf/maxscale.cnf.template.mxs1836_show_eventTimes b/maxscale-system-test/cnf/maxscale.cnf.template.mxs1836_show_eventTimes index 2f3e54183..874176098 100644 --- a/maxscale-system-test/cnf/maxscale.cnf.template.mxs1836_show_eventTimes +++ b/maxscale-system-test/cnf/maxscale.cnf.template.mxs1836_show_eventTimes @@ -15,7 +15,7 @@ socket=default type=service router=maxinfo user=maxinfo_user -passwd=maxinfo_passwd +password=maxinfo_passwd [MaxInfo-Listener] type=listener diff --git a/maxscale-system-test/cnf/maxscale.cnf.template.mxs1849_table_sharding b/maxscale-system-test/cnf/maxscale.cnf.template.mxs1849_table_sharding index 30b9659ad..8a8cf1724 100755 --- a/maxscale-system-test/cnf/maxscale.cnf.template.mxs1849_table_sharding +++ b/maxscale-system-test/cnf/maxscale.cnf.template.mxs1849_table_sharding @@ -7,14 +7,14 @@ type=monitor module=mysqlmon servers=server1,server2,server3,server4 user=maxskysql -passwd=skysql +password=skysql [Sharding router] type=service router=schemarouter servers=server1,server2,server3,server4 user=maxskysql -passwd=skysql +password=skysql auth_all_servers=1 [Sharding Listener] diff --git a/maxscale-system-test/cnf/maxscale.cnf.template.mxs1889 b/maxscale-system-test/cnf/maxscale.cnf.template.mxs1889 index e31fc2c9e..d93aa36bd 100644 --- a/maxscale-system-test/cnf/maxscale.cnf.template.mxs1889 +++ b/maxscale-system-test/cnf/maxscale.cnf.template.mxs1889 @@ -8,7 +8,7 @@ module=mysqlmon ###repl51### servers=server1,server2,server3,server4 user=maxskysql -passwd=skysql +password=skysql monitor_interval=1000 [RW Split Router] @@ -16,7 +16,7 @@ type=service router=readwritesplit servers=server1,server2,server3,server4 user=maxskysql -passwd=skysql +password=skysql router_options=slave_selection_criteria=LEAST_GLOBAL_CONNECTIONS max_slave_connections=1 @@ -26,7 +26,7 @@ router=readconnroute router_options=slave servers=server1,server2,server3,server4 user=maxskysql -passwd=skysql +password=skysql [Read Connection Router Master] type=service @@ -34,7 +34,7 @@ router=readconnroute router_options=master servers=server1,server2,server3,server4 user=maxskysql -passwd=skysql +password=skysql [RW Split Listener] type=listener diff --git a/maxscale-system-test/cnf/maxscale.cnf.template.mxs1926_killed_server b/maxscale-system-test/cnf/maxscale.cnf.template.mxs1926_killed_server index 758a611eb..f7bc4a752 100755 --- a/maxscale-system-test/cnf/maxscale.cnf.template.mxs1926_killed_server +++ b/maxscale-system-test/cnf/maxscale.cnf.template.mxs1926_killed_server @@ -6,7 +6,7 @@ type=monitor module=mysqlmon servers=server1,server2,server3,server4 user=maxskysql -passwd=skysql +password=skysql monitor_interval=1000 [RW Split Router] @@ -14,7 +14,7 @@ type=service router=readwritesplit servers=server1,server2,server3,server4 user=maxskysql -passwd=skysql +password=skysql [RW Split Listener] type=listener diff --git a/maxscale-system-test/cnf/maxscale.cnf.template.mxs359_error_on_write b/maxscale-system-test/cnf/maxscale.cnf.template.mxs359_error_on_write index 72a266821..a0a089d07 100644 --- a/maxscale-system-test/cnf/maxscale.cnf.template.mxs359_error_on_write +++ b/maxscale-system-test/cnf/maxscale.cnf.template.mxs359_error_on_write @@ -6,7 +6,7 @@ type=monitor module=mysqlmon servers=server1,server2,server3,server4 user=maxskysql -passwd=skysql +password=skysql monitor_interval=1000 [RW-Split-Router] @@ -14,7 +14,7 @@ type=service router=readwritesplit servers=server1,server2,server3,server4 user=maxskysql -passwd=skysql +password=skysql master_reconnection=true master_failure_mode=error_on_write diff --git a/maxscale-system-test/cnf/maxscale.cnf.template.mxs359_master_switch b/maxscale-system-test/cnf/maxscale.cnf.template.mxs359_master_switch index 167a294e4..22571dc60 100644 --- a/maxscale-system-test/cnf/maxscale.cnf.template.mxs359_master_switch +++ b/maxscale-system-test/cnf/maxscale.cnf.template.mxs359_master_switch @@ -6,7 +6,7 @@ type=monitor module=mysqlmon servers=server1,server2,server3,server4 user=maxskysql -passwd=skysql +password=skysql monitor_interval=1000 [RW-Split-Router] @@ -14,7 +14,7 @@ type=service router=readwritesplit servers=server1,server2,server3,server4 user=maxskysql -passwd=skysql +password=skysql master_reconnection=true [RW-Split-Listener] diff --git a/maxscale-system-test/cnf/maxscale.cnf.template.mxs359_read_only b/maxscale-system-test/cnf/maxscale.cnf.template.mxs359_read_only index ef2b01201..45249cce3 100644 --- a/maxscale-system-test/cnf/maxscale.cnf.template.mxs359_read_only +++ b/maxscale-system-test/cnf/maxscale.cnf.template.mxs359_read_only @@ -6,7 +6,7 @@ type=monitor module=mysqlmon servers=server1,server2,server3,server4 user=maxskysql -passwd=skysql +password=skysql monitor_interval=1000 [RW-Split-Router] @@ -14,7 +14,7 @@ type=service router=readwritesplit servers=server1,server2,server3,server4 user=maxskysql -passwd=skysql +password=skysql master_reconnection=true master_failure_mode=fail_on_write diff --git a/maxscale-system-test/cnf/maxscale.cnf.template.mxs361 b/maxscale-system-test/cnf/maxscale.cnf.template.mxs361 index f60762bf1..36d679440 100755 --- a/maxscale-system-test/cnf/maxscale.cnf.template.mxs361 +++ b/maxscale-system-test/cnf/maxscale.cnf.template.mxs361 @@ -7,7 +7,7 @@ type=monitor module=mysqlmon servers= server1, server2,server3 ,server4 user=maxskysql -passwd= skysql +password= skysql monitor_interval=100 [RW Split Router] @@ -15,7 +15,7 @@ type=service router= readwritesplit servers=server1, server2, server3,server4 user=maxskysql -passwd=skysql +password=skysql router_options=slave_selection_criteria=LEAST_ROUTER_CONNECTIONS [Read Connection Router Slave] @@ -24,7 +24,7 @@ router=readconnroute router_options= slave servers=server1,server2,server3,server4 user=maxskysql -passwd=skysql +password=skysql [Read Connection Router Master] type=service @@ -32,7 +32,7 @@ router=readconnroute router_options=master servers=server1,server2,server3,server4 user=maxskysql -passwd=skysql +password=skysql [RW Split Listener] type=listener @@ -69,7 +69,7 @@ type=service router= readwritesplit servers=gserver1,gserver2,gserver3,gserver4 user=maxskysql -passwd=skysql +password=skysql router_options=slave_selection_criteria=LEAST_ROUTER_CONNECTIONS [RW Split Listener Galera] @@ -83,7 +83,7 @@ type=monitor module=galeramon servers=gserver1,gserver2,gserver3,gserver4 user=maxskysql -passwd=skysql +password=skysql monitor_interval=100 root_node_as_master=false diff --git a/maxscale-system-test/cnf/maxscale.cnf.template.mxs421_events b/maxscale-system-test/cnf/maxscale.cnf.template.mxs421_events index 5a00ba908..f658d419f 100644 --- a/maxscale-system-test/cnf/maxscale.cnf.template.mxs421_events +++ b/maxscale-system-test/cnf/maxscale.cnf.template.mxs421_events @@ -9,7 +9,7 @@ type=monitor module=mysqlmon servers=server1 user=maxskysql -passwd=skysql +password=skysql monitor_interval=1000 [RW-Split-Router] @@ -17,7 +17,7 @@ type=service router=readwritesplit servers=server1 user=maxskysql -passwd=skysql +password=skysql [RW-Split-Listener] type=listener diff --git a/maxscale-system-test/cnf/maxscale.cnf.template.mxs501 b/maxscale-system-test/cnf/maxscale.cnf.template.mxs501 index e8835f35c..4a7f44e2e 100755 --- a/maxscale-system-test/cnf/maxscale.cnf.template.mxs501 +++ b/maxscale-system-test/cnf/maxscale.cnf.template.mxs501 @@ -7,7 +7,7 @@ type=monitor module=mysqlmon servers= server1, server2,server3 ,server4 user=maxskysql -passwd= skysql +password= skysql monitor_interval=1000 [RW Split Router] @@ -15,7 +15,7 @@ type=service router= readwritesplit servers=server1, server2, server3,server4 user=maxskysql -passwd=skysql +password=skysql router_options=slave_selection_criteria=LEAST_ROUTER_CONNECTIONS max_slave_connections=1 filters=duplicate @@ -32,7 +32,7 @@ router=readconnroute router_options= slave servers=server1,server2,server3,server4 user=maxskysql -passwd=skysql +password=skysql [Read Connection Router Master] type=service @@ -40,7 +40,7 @@ router=readconnroute router_options=master servers=server1,server2,server3,server4 user=maxskysql -passwd=skysql +password=skysql [RW Split Listener] type=listener diff --git a/maxscale-system-test/cnf/maxscale.cnf.template.mxs548 b/maxscale-system-test/cnf/maxscale.cnf.template.mxs548 index 9f1a809fc..43a64c8b6 100755 --- a/maxscale-system-test/cnf/maxscale.cnf.template.mxs548 +++ b/maxscale-system-test/cnf/maxscale.cnf.template.mxs548 @@ -7,7 +7,7 @@ type=monitor module=mysqlmon servers= server1, server2 user=maxskysql -passwd= skysql +password= skysql monitor_interval=1000 [RW Split Router] @@ -15,7 +15,7 @@ type=service router= readwritesplit servers=server1, server2 user=maxskysql -passwd=skysql +password=skysql router_options=slave_selection_criteria=LEAST_ROUTER_CONNECTIONS max_slave_connections=1 @@ -25,7 +25,7 @@ router=readconnroute router_options= slave servers=server1,server2 user=maxskysql -passwd=skysql +password=skysql [Read Connection Router Master] type=service @@ -33,7 +33,7 @@ router=readconnroute router_options=master servers=server1,server2 user=maxskysql -passwd=skysql +password=skysql [RW Split Listener] type=listener diff --git a/maxscale-system-test/cnf/maxscale.cnf.template.mxs559 b/maxscale-system-test/cnf/maxscale.cnf.template.mxs559 index 5da95b567..792520fc6 100755 --- a/maxscale-system-test/cnf/maxscale.cnf.template.mxs559 +++ b/maxscale-system-test/cnf/maxscale.cnf.template.mxs559 @@ -7,7 +7,7 @@ type=monitor module=mysqlmon servers= server1, server2 user=maxskysql -passwd= skysql +password= skysql monitor_interval=1000 backend_connect_timeout=1 backend_read_timeout=1 @@ -17,7 +17,7 @@ type=service router= readwritesplit servers=server1, server2 user=maxskysql -passwd=skysql +password=skysql router_options=slave_selection_criteria=LEAST_ROUTER_CONNECTIONS max_slave_connections=1 @@ -27,7 +27,7 @@ router=readconnroute router_options= slave servers=server1,server2 user=maxskysql -passwd=skysql +password=skysql [Read Connection Router Master] type=service @@ -35,7 +35,7 @@ router=readconnroute router_options=master servers=server1,server2 user=maxskysql -passwd=skysql +password=skysql [RW Split Listener] type=listener diff --git a/maxscale-system-test/cnf/maxscale.cnf.template.mxs710_bad_socket b/maxscale-system-test/cnf/maxscale.cnf.template.mxs710_bad_socket index 6e6c80c98..642eac2b3 100755 --- a/maxscale-system-test/cnf/maxscale.cnf.template.mxs710_bad_socket +++ b/maxscale-system-test/cnf/maxscale.cnf.template.mxs710_bad_socket @@ -7,7 +7,7 @@ type=monitor module=mysqlmon servers= server1, server2,server3 ,server4 user=maxskysql -passwd= skysql +password= skysql monitor_interval=1000 detect_stale_master=false @@ -16,7 +16,7 @@ type=service router= readwritesplit servers=server1, server2, server3,server4 user=maxskysql -passwd=skysql +password=skysql router_options=slave_selection_criteria=LEAST_GLOBAL_CONNECTIONS max_slave_connections=1 @@ -26,7 +26,7 @@ router=readconnroute router_options= slave servers=server1,server2,server3,server4 user=maxskysql -passwd=skysql +password=skysql [Read Connection Router Master] type=service @@ -34,7 +34,7 @@ router=readconnroute router_options=master servers=server1,server2,server3,server4 user=maxskysql -passwd=skysql +password=skysql [RW Split Listener] type=listener diff --git a/maxscale-system-test/cnf/maxscale.cnf.template.mxs711_two_ports b/maxscale-system-test/cnf/maxscale.cnf.template.mxs711_two_ports index aec52737b..68c2b203f 100755 --- a/maxscale-system-test/cnf/maxscale.cnf.template.mxs711_two_ports +++ b/maxscale-system-test/cnf/maxscale.cnf.template.mxs711_two_ports @@ -7,7 +7,7 @@ type=monitor module=mysqlmon servers= server1, server2,server3 ,server4 user=maxskysql -passwd= skysql +password= skysql monitor_interval=1000 detect_stale_master=false @@ -16,7 +16,7 @@ type=service router= readwritesplit servers=server1, server2, server3,server4 user=maxskysql -passwd=skysql +password=skysql router_options=slave_selection_criteria=LEAST_GLOBAL_CONNECTIONS max_slave_connections=1 @@ -26,7 +26,7 @@ router=readconnroute router_options= slave servers=server1,server2,server3,server4 user=maxskysql -passwd=skysql +password=skysql [Read Connection Router Master] type=service @@ -34,7 +34,7 @@ router=readconnroute router_options=master servers=server1,server2,server3,server4 user=maxskysql -passwd=skysql +password=skysql [RW Split Listener] type=listener diff --git a/maxscale-system-test/cnf/maxscale.cnf.template.mxs720_line_with_no_equal b/maxscale-system-test/cnf/maxscale.cnf.template.mxs720_line_with_no_equal index 305c506ff..20f438a5d 100755 --- a/maxscale-system-test/cnf/maxscale.cnf.template.mxs720_line_with_no_equal +++ b/maxscale-system-test/cnf/maxscale.cnf.template.mxs720_line_with_no_equal @@ -7,7 +7,7 @@ type=monitor module=mysqlmon servers= server1, server2,server3 ,server4 user=maxskysql -passwd= skysql +password= skysql monitor_interval=1000 [RW Split Router] @@ -15,7 +15,7 @@ type=service router= readwritesplit servers=server1, server2, server3,server4 user=maxskysql -passwd=skysql +password=skysql router_options=slave_selection_criteria=LEAST_GLOBAL_CONNECTIONS max_slave_connections=1 line_no_equal @@ -26,7 +26,7 @@ router=readconnroute router_options= slave servers=server1,server2,server3,server4 user=maxskysql -passwd=skysql +password=skysql [Read Connection Router Master] type=service @@ -34,7 +34,7 @@ router=readconnroute router_options=master servers=server1,server2,server3,server4 user=maxskysql -passwd=skysql +password=skysql [RW Split Listener] type=listener diff --git a/maxscale-system-test/cnf/maxscale.cnf.template.mxs720_wierd_line b/maxscale-system-test/cnf/maxscale.cnf.template.mxs720_wierd_line index e67041560..5b1efafe6 100755 --- a/maxscale-system-test/cnf/maxscale.cnf.template.mxs720_wierd_line +++ b/maxscale-system-test/cnf/maxscale.cnf.template.mxs720_wierd_line @@ -7,7 +7,7 @@ type=monitor module=mysqlmon servers= server1, server2,server3 ,server4 user=maxskysql -passwd= skysql +password= skysql monitor_interval=1000 [RW Split Router] @@ -15,7 +15,7 @@ type=service router= readwritesplit servers=server1, server2, server3,server4 user=maxskysql -passwd=skysql +password=skysql router_options=slave_selection_criteria=LEAST_GLOBAL_CONNECTIONS max_slave_connections=1 @@ -25,7 +25,7 @@ router=readconnroute router_options= slave servers=server1,server2,server3,server4 user=maxskysql -passwd=skysql +password=skysql hren=hren' укпоукц=так_и_крешнуться_можно @@ -35,7 +35,7 @@ router=readconnroute router_options=master servers=server1,server2,server3,server4 user=maxskysql -passwd=skysql +password=skysql [RW Split Listener] type=listener diff --git a/maxscale-system-test/cnf/maxscale.cnf.template.mxs722 b/maxscale-system-test/cnf/maxscale.cnf.template.mxs722 index 62dcdb4ae..4f1369788 100644 --- a/maxscale-system-test/cnf/maxscale.cnf.template.mxs722 +++ b/maxscale-system-test/cnf/maxscale.cnf.template.mxs722 @@ -6,7 +6,7 @@ type=monitor module=mysqlmon servers=server1,server2,server3,server4 user=maxskysql -passwd=skysql +password=skysql monitor_interval=1000 detect_stale_master=false @@ -15,7 +15,7 @@ type=service router=readwritesplit servers=server1,server2,server3,server4 user=maxskysql -passwd=skysql +password=skysql router_options=slave_selection_criteria=LEAST_GLOBAL_CONNECTIONS max_slave_connections=1 filters=QLA @@ -26,7 +26,7 @@ router=readconnroute router_options=slave servers=server1,server2,server3,server4 user=maxskysql -passwd=skysql +password=skysql filters=QLA [Read Connection Router Master] @@ -35,7 +35,7 @@ router=readconnroute router_options=master servers=server1,server2,server3,server4 user=maxskysql -passwd=skysql +password=skysql filters=QLA [QLA] diff --git a/maxscale-system-test/cnf/maxscale.cnf.template.mxs799 b/maxscale-system-test/cnf/maxscale.cnf.template.mxs799 index b7f6e60ba..b96a0c72e 100755 --- a/maxscale-system-test/cnf/maxscale.cnf.template.mxs799 +++ b/maxscale-system-test/cnf/maxscale.cnf.template.mxs799 @@ -7,7 +7,7 @@ type=monitor module=galeramon servers=server1,server2,server3,server4 user=maxskysql -passwd=skysql +password=skysql root_node_as_master=false [RW Split Router] @@ -15,7 +15,7 @@ type=service router=readwritesplit servers=server1,server2,server3,server4 user=maxskysql -passwd=skysql +password=skysql [Read Connection Router Slave] type=service @@ -23,7 +23,7 @@ router=readconnroute router_options= slave servers=server1,server2,server3,server4 user=maxskysql -passwd=skysql +password=skysql [Read Connection Router Master] type=service @@ -31,7 +31,7 @@ router=readconnroute router_options=master servers=server1,server2,server3,server4 user=maxskysql -passwd=skysql +password=skysql [RW Split Listener] type=listener diff --git a/maxscale-system-test/cnf/maxscale.cnf.template.mxs827_write_timeout b/maxscale-system-test/cnf/maxscale.cnf.template.mxs827_write_timeout index 80ccc850e..6e0fae60f 100755 --- a/maxscale-system-test/cnf/maxscale.cnf.template.mxs827_write_timeout +++ b/maxscale-system-test/cnf/maxscale.cnf.template.mxs827_write_timeout @@ -6,7 +6,7 @@ type=monitor module=mysqlmon servers=server1,server2,server3,server4 user=maxskysql -passwd=skysql +password=skysql monitor_interval=1000 detect_stale_master=false @@ -15,7 +15,7 @@ type=service router=readwritesplit servers=server1,server2,server3,server4 user=maxskysql -passwd=skysql +password=skysql router_options=slave_selection_criteria=LEAST_GLOBAL_CONNECTIONS max_slave_connections=1 connection_keepalive=5 @@ -26,7 +26,7 @@ router=readconnroute router_options=slave servers=server1,server2,server3,server4 user=maxskysql -passwd=skysql +password=skysql [Read Connection Router Master] type=service @@ -34,7 +34,7 @@ router=readconnroute router_options=master servers=server1,server2,server3,server4 user=maxskysql -passwd=skysql +password=skysql [RW Split Listener] type=listener diff --git a/maxscale-system-test/cnf/maxscale.cnf.template.mxs874 b/maxscale-system-test/cnf/maxscale.cnf.template.mxs874 index 83346052e..33f198b20 100644 --- a/maxscale-system-test/cnf/maxscale.cnf.template.mxs874 +++ b/maxscale-system-test/cnf/maxscale.cnf.template.mxs874 @@ -6,7 +6,7 @@ type=monitor module=mysqlmon servers=server1,server2,server3 user=maxskysql -passwd=skysql +password=skysql monitor_interval=1000 detect_stale_master=false @@ -16,7 +16,7 @@ router=readwritesplit servers=server1,server2,server3 router_options=disable_sescmd_history=false user=maxskysql -passwd=skysql +password=skysql max_slave_connections=1 [Read Connection Router Slave] @@ -25,7 +25,7 @@ router=readconnroute router_options=slave servers=server1,server2,server3 user=maxskysql -passwd=skysql +password=skysql [Read Connection Router Master] type=service @@ -33,7 +33,7 @@ router=readconnroute router_options=master servers=server1,server2,server3 user=maxskysql -passwd=skysql +password=skysql [RW Split Listener] type=listener diff --git a/maxscale-system-test/cnf/maxscale.cnf.template.mxs922 b/maxscale-system-test/cnf/maxscale.cnf.template.mxs922 index 3830f9b9a..7f4d7b939 100644 --- a/maxscale-system-test/cnf/maxscale.cnf.template.mxs922 +++ b/maxscale-system-test/cnf/maxscale.cnf.template.mxs922 @@ -5,27 +5,27 @@ threads=###threads### type=monitor module=mysqlmon user=maxskysql -passwd=skysql +password=skysql monitor_interval=1000 [rwsplit-service] type=service router= readwritesplit user=maxskysql -passwd=skysql +password=skysql [read-connection-router-slave] type=service router=readconnroute user=maxskysql -passwd=skysql +password=skysql [read-connection-router-master] type=service router=readconnroute router_options=master user=maxskysql -passwd=skysql +password=skysql [rwsplit-service-listener] type=listener diff --git a/maxscale-system-test/cnf/maxscale.cnf.template.mxs922_base b/maxscale-system-test/cnf/maxscale.cnf.template.mxs922_base index d8a68b4b4..81b609976 100644 --- a/maxscale-system-test/cnf/maxscale.cnf.template.mxs922_base +++ b/maxscale-system-test/cnf/maxscale.cnf.template.mxs922_base @@ -6,20 +6,20 @@ type=service router=readwritesplit weightby=weight user=maxskysql -passwd=skysql +password=skysql [read-connection-router-slave] type=service router=readconnroute user=maxskysql -passwd=skysql +password=skysql [read-connection-router-master] type=service router=readconnroute router_options=master user=maxskysql -passwd=skysql +password=skysql [CLI] type=service diff --git a/maxscale-system-test/cnf/maxscale.cnf.template.mysqlmon_backup b/maxscale-system-test/cnf/maxscale.cnf.template.mysqlmon_backup index b8c6a8276..564ec35a7 100644 --- a/maxscale-system-test/cnf/maxscale.cnf.template.mysqlmon_backup +++ b/maxscale-system-test/cnf/maxscale.cnf.template.mysqlmon_backup @@ -6,7 +6,7 @@ type=monitor module=mysqlmon servers=server1,server2,server3,server4 user=maxskysql -passwd=skysql +password=skysql monitor_interval=1000 [RW Split Router] @@ -14,7 +14,7 @@ type=service router=readwritesplit servers=server1,server2,server3,server4 user=maxskysql -passwd=skysql +password=skysql master_failure_mode=fail_on_write [Read Connection Router Slave] @@ -23,7 +23,7 @@ router=readconnroute router_options=slave servers=server1,server2 user=maxskysql -passwd=skysql +password=skysql [Read Connection Router Master] type=service @@ -31,7 +31,7 @@ router=readconnroute router_options=master servers=server1,server2 user=maxskysql -passwd=skysql +password=skysql [RW Split Listener] type=listener diff --git a/maxscale-system-test/cnf/maxscale.cnf.template.mysqlmon_detect_standalone_master b/maxscale-system-test/cnf/maxscale.cnf.template.mysqlmon_detect_standalone_master index 9cbe7dce7..5df33dd1c 100644 --- a/maxscale-system-test/cnf/maxscale.cnf.template.mysqlmon_detect_standalone_master +++ b/maxscale-system-test/cnf/maxscale.cnf.template.mysqlmon_detect_standalone_master @@ -6,7 +6,7 @@ type=monitor module=mysqlmon servers= server1, server2, server3, server4 user=maxskysql -passwd= skysql +password= skysql monitor_interval=1000 detect_standalone_master=true failcount=2 @@ -20,7 +20,7 @@ type=service router= readwritesplit servers=server1, server2, server3, server4 user=maxskysql -passwd=skysql +password=skysql [Read Connection Router Slave] type=service @@ -28,7 +28,7 @@ router=readconnroute router_options= slave servers=server1, server2, server3, server4 user=maxskysql -passwd=skysql +password=skysql [Read Connection Router Master] type=service @@ -36,7 +36,7 @@ router=readconnroute router_options=master servers=server1, server2, server3, server4 user=maxskysql -passwd=skysql +password=skysql [RW Split Listener] type=listener diff --git a/maxscale-system-test/cnf/maxscale.cnf.template.mysqlmon_external_master b/maxscale-system-test/cnf/maxscale.cnf.template.mysqlmon_external_master index b79f8227f..192279b77 100644 --- a/maxscale-system-test/cnf/maxscale.cnf.template.mysqlmon_external_master +++ b/maxscale-system-test/cnf/maxscale.cnf.template.mysqlmon_external_master @@ -6,7 +6,7 @@ type=monitor module=mysqlmon servers=server1,server2,server3 user=maxskysql -passwd=skysql +password=skysql monitor_interval=1000 detect_standalone_master=true failcount=1 @@ -25,7 +25,7 @@ type=service router=readwritesplit servers=server1,server2,server3 user=maxskysql -passwd=skysql +password=skysql [RW Split Listener] type=listener diff --git a/maxscale-system-test/cnf/maxscale.cnf.template.mysqlmon_failover_auto b/maxscale-system-test/cnf/maxscale.cnf.template.mysqlmon_failover_auto index 833349308..9699f6d72 100644 --- a/maxscale-system-test/cnf/maxscale.cnf.template.mysqlmon_failover_auto +++ b/maxscale-system-test/cnf/maxscale.cnf.template.mysqlmon_failover_auto @@ -6,7 +6,7 @@ type=monitor module=mysqlmon servers= server1, server2, server3, server4 user=maxskysql -passwd= skysql +password= skysql monitor_interval=1000 detect_standalone_master=true failcount=1 @@ -23,7 +23,7 @@ type=service router= readwritesplit servers=server1, server2, server3, server4 user=maxskysql -passwd=skysql +password=skysql [Read Connection Router Slave] type=service @@ -31,7 +31,7 @@ router=readconnroute router_options= slave servers=server1, server2, server3, server4 user=maxskysql -passwd=skysql +password=skysql [Read Connection Router Master] type=service @@ -39,7 +39,7 @@ router=readconnroute router_options=master servers=server1, server2, server3, server4 user=maxskysql -passwd=skysql +password=skysql [RW Split Listener] type=listener diff --git a/maxscale-system-test/cnf/maxscale.cnf.template.mysqlmon_failover_manual b/maxscale-system-test/cnf/maxscale.cnf.template.mysqlmon_failover_manual index 1d44c4e6b..ee95040d7 100644 --- a/maxscale-system-test/cnf/maxscale.cnf.template.mysqlmon_failover_manual +++ b/maxscale-system-test/cnf/maxscale.cnf.template.mysqlmon_failover_manual @@ -6,7 +6,7 @@ type=monitor module=mysqlmon servers= server1, server2, server3, server4 user=maxskysql -passwd= skysql +password= skysql monitor_interval=1000 detect_standalone_master=true failcount=1 @@ -22,7 +22,7 @@ type=service router= readwritesplit servers=server1, server2, server3, server4 user=maxskysql -passwd=skysql +password=skysql [Read Connection Router Slave] type=service @@ -30,7 +30,7 @@ router=readconnroute router_options= slave servers=server1, server2, server3, server4 user=maxskysql -passwd=skysql +password=skysql [Read Connection Router Master] type=service @@ -38,7 +38,7 @@ router=readconnroute router_options=master servers=server1, server2, server3, server4 user=maxskysql -passwd=skysql +password=skysql [RW Split Listener] type=listener diff --git a/maxscale-system-test/cnf/maxscale.cnf.template.mysqlmon_failover_manual2_2 b/maxscale-system-test/cnf/maxscale.cnf.template.mysqlmon_failover_manual2_2 index 6592a4be9..da63ebf1d 100644 --- a/maxscale-system-test/cnf/maxscale.cnf.template.mysqlmon_failover_manual2_2 +++ b/maxscale-system-test/cnf/maxscale.cnf.template.mysqlmon_failover_manual2_2 @@ -6,7 +6,7 @@ type=monitor module=mysqlmon servers= server1, server2 user=maxskysql -passwd= skysql +password= skysql monitor_interval=1000 allow_cluster_recovery=true detect_standalone_master=true @@ -22,7 +22,7 @@ type=service router= readwritesplit servers=server1, server2 user=maxskysql -passwd=skysql +password=skysql [Read-Connection-Router-Slave] type=service @@ -30,7 +30,7 @@ router=readconnroute router_options= slave servers=server1, server2 user=maxskysql -passwd=skysql +password=skysql [Read-Connection-Router-Master] type=service @@ -38,7 +38,7 @@ router=readconnroute router_options=master servers=server1, server2 user=maxskysql -passwd=skysql +password=skysql [RW-Split-Listener] type=listener diff --git a/maxscale-system-test/cnf/maxscale.cnf.template.mysqlmon_failover_manual2_3 b/maxscale-system-test/cnf/maxscale.cnf.template.mysqlmon_failover_manual2_3 index 9f063108e..49668740b 100644 --- a/maxscale-system-test/cnf/maxscale.cnf.template.mysqlmon_failover_manual2_3 +++ b/maxscale-system-test/cnf/maxscale.cnf.template.mysqlmon_failover_manual2_3 @@ -6,7 +6,7 @@ type=monitor module=mysqlmon servers= server1, server2, server3 user=maxskysql -passwd= skysql +password= skysql monitor_interval=1000 allow_cluster_recovery=true detect_standalone_master=true @@ -22,7 +22,7 @@ type=service router= readwritesplit servers=server1, server2, server3 user=maxskysql -passwd=skysql +password=skysql [Read-Connection-Router-Slave] type=service @@ -30,7 +30,7 @@ router=readconnroute router_options= slave servers=server1, server2, server3 user=maxskysql -passwd=skysql +password=skysql [Read-Connection-Router-Master] type=service @@ -38,7 +38,7 @@ router=readconnroute router_options=master servers=server1, server2, server3 user=maxskysql -passwd=skysql +password=skysql [RW-Split-Listener] type=listener diff --git a/maxscale-system-test/cnf/maxscale.cnf.template.mysqlmon_failover_manual2_4 b/maxscale-system-test/cnf/maxscale.cnf.template.mysqlmon_failover_manual2_4 index 9674e7f98..224c6347a 100644 --- a/maxscale-system-test/cnf/maxscale.cnf.template.mysqlmon_failover_manual2_4 +++ b/maxscale-system-test/cnf/maxscale.cnf.template.mysqlmon_failover_manual2_4 @@ -6,7 +6,7 @@ type=monitor module=mysqlmon servers= server1, server2, server3, server4 user=maxskysql -passwd= skysql +password= skysql monitor_interval=1000 allow_cluster_recovery=true detect_standalone_master=true @@ -22,7 +22,7 @@ type=service router= readwritesplit servers=server1, server2, server3, server4 user=maxskysql -passwd=skysql +password=skysql [Read-Connection-Router-Slave] type=service @@ -30,7 +30,7 @@ router=readconnroute router_options= slave servers=server1, server2, server3, server4 user=maxskysql -passwd=skysql +password=skysql [Read-Connection-Router-Master] type=service @@ -38,7 +38,7 @@ router=readconnroute router_options=master servers=server1, server2, server3, server4 user=maxskysql -passwd=skysql +password=skysql [RW-Split-Listener] type=listener diff --git a/maxscale-system-test/cnf/maxscale.cnf.template.mysqlmon_failover_rejoin_old_slave b/maxscale-system-test/cnf/maxscale.cnf.template.mysqlmon_failover_rejoin_old_slave index e124174f5..2a74b0601 100644 --- a/maxscale-system-test/cnf/maxscale.cnf.template.mysqlmon_failover_rejoin_old_slave +++ b/maxscale-system-test/cnf/maxscale.cnf.template.mysqlmon_failover_rejoin_old_slave @@ -6,7 +6,7 @@ type=monitor module=mysqlmon servers= server1, server2, server3, server4 user=maxskysql -passwd= skysql +password= skysql monitor_interval=1000 allow_cluster_recovery=true detect_standalone_master=true @@ -24,7 +24,7 @@ type=service router= readwritesplit servers=server1, server2, server3, server4 user=maxskysql -passwd=skysql +password=skysql [Read-Connection-Router-Slave] type=service @@ -32,7 +32,7 @@ router=readconnroute router_options= slave servers=server1, server2, server3, server4 user=maxskysql -passwd=skysql +password=skysql [Read-Connection-Router-Master] type=service @@ -40,7 +40,7 @@ router=readconnroute router_options=master servers=server1, server2, server3, server4 user=maxskysql -passwd=skysql +password=skysql [RW-Split-Listener] type=listener diff --git a/maxscale-system-test/cnf/maxscale.cnf.template.mysqlmon_failover_rolling_master b/maxscale-system-test/cnf/maxscale.cnf.template.mysqlmon_failover_rolling_master index 99a804128..df398371d 100644 --- a/maxscale-system-test/cnf/maxscale.cnf.template.mysqlmon_failover_rolling_master +++ b/maxscale-system-test/cnf/maxscale.cnf.template.mysqlmon_failover_rolling_master @@ -6,7 +6,7 @@ type=monitor module=mysqlmon servers= server1, server2, server3, server4 user=maxskysql -passwd= skysql +password= skysql monitor_interval=1000 allow_cluster_recovery=true detect_standalone_master=true @@ -22,7 +22,7 @@ type=service router= readwritesplit servers=server1, server2, server3, server4 user=maxskysql -passwd=skysql +password=skysql [Read-Connection-Router-Slave] type=service @@ -30,7 +30,7 @@ router=readconnroute router_options= slave servers=server1, server2, server3, server4 user=maxskysql -passwd=skysql +password=skysql [Read-Connection-Router-Master] type=service @@ -38,7 +38,7 @@ router=readconnroute router_options=master servers=server1, server2, server3, server4 user=maxskysql -passwd=skysql +password=skysql [RW-Split-Listener] type=listener diff --git a/maxscale-system-test/cnf/maxscale.cnf.template.mysqlmon_failover_rolling_restart_slaves b/maxscale-system-test/cnf/maxscale.cnf.template.mysqlmon_failover_rolling_restart_slaves index 109fd45b7..a1821c937 100644 --- a/maxscale-system-test/cnf/maxscale.cnf.template.mysqlmon_failover_rolling_restart_slaves +++ b/maxscale-system-test/cnf/maxscale.cnf.template.mysqlmon_failover_rolling_restart_slaves @@ -6,7 +6,7 @@ type=monitor module=mysqlmon servers= server1, server2, server3, server4 user=maxskysql -passwd= skysql +password= skysql monitor_interval=1000 allow_cluster_recovery=true detect_standalone_master=true @@ -23,7 +23,7 @@ type=service router= readwritesplit servers=server1, server2, server3, server4 user=maxskysql -passwd=skysql +password=skysql [Read-Connection-Router-Slave] type=service @@ -31,7 +31,7 @@ router=readconnroute router_options= slave servers=server1, server2, server3, server4 user=maxskysql -passwd=skysql +password=skysql [Read-Connection-Router-Master] type=service @@ -39,7 +39,7 @@ router=readconnroute router_options=master servers=server1, server2, server3, server4 user=maxskysql -passwd=skysql +password=skysql [RW-Split-Listener] type=listener diff --git a/maxscale-system-test/cnf/maxscale.cnf.template.mysqlmon_failover_stress b/maxscale-system-test/cnf/maxscale.cnf.template.mysqlmon_failover_stress index e124174f5..2a74b0601 100644 --- a/maxscale-system-test/cnf/maxscale.cnf.template.mysqlmon_failover_stress +++ b/maxscale-system-test/cnf/maxscale.cnf.template.mysqlmon_failover_stress @@ -6,7 +6,7 @@ type=monitor module=mysqlmon servers= server1, server2, server3, server4 user=maxskysql -passwd= skysql +password= skysql monitor_interval=1000 allow_cluster_recovery=true detect_standalone_master=true @@ -24,7 +24,7 @@ type=service router= readwritesplit servers=server1, server2, server3, server4 user=maxskysql -passwd=skysql +password=skysql [Read-Connection-Router-Slave] type=service @@ -32,7 +32,7 @@ router=readconnroute router_options= slave servers=server1, server2, server3, server4 user=maxskysql -passwd=skysql +password=skysql [Read-Connection-Router-Master] type=service @@ -40,7 +40,7 @@ router=readconnroute router_options=master servers=server1, server2, server3, server4 user=maxskysql -passwd=skysql +password=skysql [RW-Split-Listener] type=listener diff --git a/maxscale-system-test/cnf/maxscale.cnf.template.mysqlmon_rejoin_good b/maxscale-system-test/cnf/maxscale.cnf.template.mysqlmon_rejoin_good index a12d53d1f..21d99f979 100644 --- a/maxscale-system-test/cnf/maxscale.cnf.template.mysqlmon_rejoin_good +++ b/maxscale-system-test/cnf/maxscale.cnf.template.mysqlmon_rejoin_good @@ -6,7 +6,7 @@ type=monitor module=mysqlmon servers= server1, server2, server3, server4 user=maxskysql -passwd= skysql +password= skysql monitor_interval=1000 detect_standalone_master=true failcount=1 @@ -24,7 +24,7 @@ type=service router= readwritesplit servers=server1, server2, server3, server4 user=maxskysql -passwd=skysql +password=skysql [Read Connection Router Slave] type=service @@ -32,7 +32,7 @@ router=readconnroute router_options= slave servers=server1, server2, server3, server4 user=maxskysql -passwd=skysql +password=skysql [Read Connection Router Master] type=service @@ -40,7 +40,7 @@ router=readconnroute router_options=master servers=server1, server2, server3, server4 user=maxskysql -passwd=skysql +password=skysql [RW Split Listener] type=listener diff --git a/maxscale-system-test/cnf/maxscale.cnf.template.mysqlmon_rejoin_manual b/maxscale-system-test/cnf/maxscale.cnf.template.mysqlmon_rejoin_manual index 686ca30de..33bba7c5f 100644 --- a/maxscale-system-test/cnf/maxscale.cnf.template.mysqlmon_rejoin_manual +++ b/maxscale-system-test/cnf/maxscale.cnf.template.mysqlmon_rejoin_manual @@ -6,7 +6,7 @@ type=monitor module=mysqlmon servers= server1, server2, server3, server4 user=maxskysql -passwd= skysql +password= skysql monitor_interval=1000 detect_standalone_master=true failcount=1 @@ -23,7 +23,7 @@ type=service router= readwritesplit servers=server1, server2, server3, server4 user=maxskysql -passwd=skysql +password=skysql [Read Connection Router Slave] type=service @@ -31,7 +31,7 @@ router=readconnroute router_options= slave servers=server1, server2, server3, server4 user=maxskysql -passwd=skysql +password=skysql [Read Connection Router Master] type=service @@ -39,7 +39,7 @@ router=readconnroute router_options=master servers=server1, server2, server3, server4 user=maxskysql -passwd=skysql +password=skysql [RW Split Listener] type=listener diff --git a/maxscale-system-test/cnf/maxscale.cnf.template.mysqlmon_switchover b/maxscale-system-test/cnf/maxscale.cnf.template.mysqlmon_switchover index 36134109e..3355a8dc8 100644 --- a/maxscale-system-test/cnf/maxscale.cnf.template.mysqlmon_switchover +++ b/maxscale-system-test/cnf/maxscale.cnf.template.mysqlmon_switchover @@ -6,7 +6,7 @@ type=monitor module=mysqlmon servers= server1, server2, server3, server4 user=maxskysql -passwd= skysql +password= skysql monitor_interval=1000 allow_cluster_recovery=true detect_standalone_master=true @@ -23,7 +23,7 @@ type=service router= readwritesplit servers=server1, server2, server3, server4 user=maxskysql -passwd=skysql +password=skysql [Read-Connection-Router-Slave] type=service @@ -31,7 +31,7 @@ router=readconnroute router_options= slave servers=server1, server2, server3, server4 user=maxskysql -passwd=skysql +password=skysql [Read-Connection-Router-Master] type=service @@ -39,7 +39,7 @@ router=readconnroute router_options=master servers=server1, server2, server3, server4 user=maxskysql -passwd=skysql +password=skysql [RW-Split-Listener] type=listener diff --git a/maxscale-system-test/cnf/maxscale.cnf.template.mysqlmon_switchover_bad_master b/maxscale-system-test/cnf/maxscale.cnf.template.mysqlmon_switchover_bad_master index 5e609ff33..d508672e0 100644 --- a/maxscale-system-test/cnf/maxscale.cnf.template.mysqlmon_switchover_bad_master +++ b/maxscale-system-test/cnf/maxscale.cnf.template.mysqlmon_switchover_bad_master @@ -6,7 +6,7 @@ type=monitor module=mysqlmon servers= server1, server2, server3, server4 user=maxskysql -passwd= skysql +password= skysql monitor_interval=1000 allow_cluster_recovery=true detect_standalone_master=true @@ -24,7 +24,7 @@ type=service router= readwritesplit servers=server1, server2, server3, server4 user=maxskysql -passwd=skysql +password=skysql [Read-Connection-Router-Slave] type=service @@ -32,7 +32,7 @@ router=readconnroute router_options= slave servers=server1, server2, server3, server4 user=maxskysql -passwd=skysql +password=skysql [Read-Connection-Router-Master] type=service @@ -40,7 +40,7 @@ router=readconnroute router_options=master servers=server1, server2, server3, server4 user=maxskysql -passwd=skysql +password=skysql [RW-Split-Listener] type=listener diff --git a/maxscale-system-test/cnf/maxscale.cnf.template.mysqlmon_switchover_stress b/maxscale-system-test/cnf/maxscale.cnf.template.mysqlmon_switchover_stress index b64456030..3c6bd7371 100644 --- a/maxscale-system-test/cnf/maxscale.cnf.template.mysqlmon_switchover_stress +++ b/maxscale-system-test/cnf/maxscale.cnf.template.mysqlmon_switchover_stress @@ -6,7 +6,7 @@ type=monitor module=mysqlmon servers=server1, server2, server3, server4 user=maxskysql -passwd=skysql +password=skysql monitor_interval=1000 allow_cluster_recovery=true detect_standalone_master=true @@ -23,7 +23,7 @@ type=service router= readwritesplit servers=server1, server2, server3, server4 user=maxskysql -passwd=skysql +password=skysql [Read-Connection-Router-Slave] type=service @@ -31,7 +31,7 @@ router=readconnroute router_options= slave servers=server1, server2, server3, server4 user=maxskysql -passwd=skysql +password=skysql [Read-Connection-Router-Master] type=service @@ -39,7 +39,7 @@ router=readconnroute router_options=master servers=server1, server2, server3, server4 user=maxskysql -passwd=skysql +password=skysql [RW-Split-Listener] type=listener diff --git a/maxscale-system-test/cnf/maxscale.cnf.template.namedserverfilter b/maxscale-system-test/cnf/maxscale.cnf.template.namedserverfilter index edd988c5a..163c92da5 100644 --- a/maxscale-system-test/cnf/maxscale.cnf.template.namedserverfilter +++ b/maxscale-system-test/cnf/maxscale.cnf.template.namedserverfilter @@ -13,7 +13,7 @@ type=monitor module=mysqlmon servers=server1,server2,server3,server4 user=maxskysql -passwd=skysql +password=skysql monitor_interval=1000 [RW Split Router] @@ -23,7 +23,7 @@ router=readwritesplit # Mixing the order of slaves will make server3 the first slave server servers=server1,server3,server2,server4 user=maxskysql -passwd=skysql +password=skysql filters=namedserverfilter [CLI] @@ -42,7 +42,7 @@ router=readconnroute router_options=slave servers=server1,server2,server3,server4 user=maxskysql -passwd=skysql +password=skysql [Read Connection Router Master] type=service @@ -50,7 +50,7 @@ router=readconnroute router_options=master servers=server1,server2,server3,server4 user=maxskysql -passwd=skysql +password=skysql [RW Split Listener] type=listener diff --git a/maxscale-system-test/cnf/maxscale.cnf.template.no_ses_cmd_store b/maxscale-system-test/cnf/maxscale.cnf.template.no_ses_cmd_store index ec057b57f..80f4d195b 100755 --- a/maxscale-system-test/cnf/maxscale.cnf.template.no_ses_cmd_store +++ b/maxscale-system-test/cnf/maxscale.cnf.template.no_ses_cmd_store @@ -7,7 +7,7 @@ type=monitor module=mysqlmon servers= server1, server2,server3 ,server4 user=maxskysql -passwd= skysql +password= skysql monitor_interval=1000 [RW Split Router] @@ -15,7 +15,7 @@ type=service router= readwritesplit servers=server1, server2, server3,server4 user=maxskysql -passwd=skysql +password=skysql router_options=slave_selection_criteria=LEAST_GLOBAL_CONNECTIONS,disable_sescmd_history=true max_slave_connections=1 @@ -25,7 +25,7 @@ router=readconnroute router_options= slave servers=server1,server2,server3,server4 user=maxskysql -passwd=skysql +password=skysql [Read Connection Router Master] type=service @@ -33,7 +33,7 @@ router=readconnroute router_options=master servers=server1,server2,server3,server4 user=maxskysql -passwd=skysql +password=skysql [RW Split Listener] type=listener diff --git a/maxscale-system-test/cnf/maxscale.cnf.template.nsfilter b/maxscale-system-test/cnf/maxscale.cnf.template.nsfilter index 002a26668..42bbc8229 100644 --- a/maxscale-system-test/cnf/maxscale.cnf.template.nsfilter +++ b/maxscale-system-test/cnf/maxscale.cnf.template.nsfilter @@ -7,7 +7,7 @@ type=monitor module=mysqlmon servers=server1, server2, server3, server4 user=maxskysql -passwd=skysql +password=skysql monitor_interval=1000 [RW Split Router] @@ -15,7 +15,7 @@ type=service router=readwritesplit servers=server1, server2, server3, server4 user=maxskysql -passwd=skysql +password=skysql filters=nsfilter [nsfilter] @@ -30,7 +30,7 @@ router=readconnroute router_options=slave servers=server1, server2, server3, server4 user=maxskysql -passwd=skysql +password=skysql [Read Connection Router Master] type=service @@ -38,7 +38,7 @@ router=readconnroute router_options=master servers=server1, server2, server3, server4 user=maxskysql -passwd=skysql +password=skysql [RW Split Listener] type=listener diff --git a/maxscale-system-test/cnf/maxscale.cnf.template.old_passwd b/maxscale-system-test/cnf/maxscale.cnf.template.old_passwd new file mode 100755 index 000000000..e84aca8d2 --- /dev/null +++ b/maxscale-system-test/cnf/maxscale.cnf.template.old_passwd @@ -0,0 +1,47 @@ +[maxscale] +threads=###threads### + +[MySQL Monitor] +type=monitor +module=mysqlmon +servers=server1,server2 +user=maxskysql +password=skysql +monitor_interval=1000 +detect_stale_master=false +detect_standalone_master=false + +[RW Split Router] +type=service +router=readwritesplit +servers=server1,server2 +user=maxskysql +passwd=skysql + +[RW Split Listener] +type=listener +service=RW Split Router +protocol=MySQLClient +port=4006 + +[CLI] +type=service +router=cli + +[CLI Listener] +type=listener +service=CLI +protocol=maxscaled +socket=default + +[server1] +type=server +address=###node_server_IP_1### +port=###node_server_port_1### +protocol=MySQLBackend + +[server2] +type=server +address=###node_server_IP_2### +port=###node_server_port_2### +protocol=MySQLBackend diff --git a/maxscale-system-test/cnf/maxscale.cnf.template.open_close b/maxscale-system-test/cnf/maxscale.cnf.template.open_close index 2417b74ba..aa8e0ff85 100755 --- a/maxscale-system-test/cnf/maxscale.cnf.template.open_close +++ b/maxscale-system-test/cnf/maxscale.cnf.template.open_close @@ -7,7 +7,7 @@ type=monitor module=mysqlmon servers= server1, server2,server3 ,server4 user=maxskysql -passwd= skysql +password= skysql monitor_interval=1000 [RW Split Router] @@ -15,7 +15,7 @@ type=service router= readwritesplit servers=server1, server2, server3,server4 user=maxskysql -passwd=skysql +password=skysql router_options=slave_selection_criteria=LEAST_GLOBAL_CONNECTIONS max_slave_connections=1 @@ -25,7 +25,7 @@ router=readconnroute router_options= slave servers=server1,server2,server3,server4 user=maxskysql -passwd=skysql +password=skysql [Read Connection Router Master] type=service @@ -33,7 +33,7 @@ router=readconnroute router_options=master servers=server1,server2,server3,server4 user=maxskysql -passwd=skysql +password=skysql [RW Split Listener] type=listener diff --git a/maxscale-system-test/cnf/maxscale.cnf.template.pers_01 b/maxscale-system-test/cnf/maxscale.cnf.template.pers_01 index adb35eb92..ec06bfa63 100755 --- a/maxscale-system-test/cnf/maxscale.cnf.template.pers_01 +++ b/maxscale-system-test/cnf/maxscale.cnf.template.pers_01 @@ -7,7 +7,7 @@ type=monitor module=mysqlmon servers= server1, server2,server3 ,server4 user=maxskysql -passwd= skysql +password= skysql monitor_interval=100 [RW Split Router] @@ -15,7 +15,7 @@ type=service router= readwritesplit servers=server1, server2, server3,server4 user=maxskysql -passwd=skysql +password=skysql router_options=slave_selection_criteria=LEAST_ROUTER_CONNECTIONS [Read Connection Router Slave] @@ -24,7 +24,7 @@ router=readconnroute router_options= slave servers=server1,server2,server3,server4 user=maxskysql -passwd=skysql +password=skysql [Read Connection Router Master] type=service @@ -32,7 +32,7 @@ router=readconnroute router_options=master servers=server1,server2,server3,server4 user=maxskysql -passwd=skysql +password=skysql [RW Split Listener] type=listener @@ -69,7 +69,7 @@ type=service router= readwritesplit servers=gserver1,gserver2,gserver3,gserver4 user=maxskysql -passwd=skysql +password=skysql router_options=slave_selection_criteria=LEAST_ROUTER_CONNECTIONS [RW Split Listener Galera] @@ -83,7 +83,7 @@ type=monitor module=galeramon servers=gserver1,gserver2,gserver3,gserver4 user=maxskysql -passwd=skysql +password=skysql monitor_interval=100 root_node_as_master=false diff --git a/maxscale-system-test/cnf/maxscale.cnf.template.regexfilter1 b/maxscale-system-test/cnf/maxscale.cnf.template.regexfilter1 index 1352e297c..fdefa71a4 100644 --- a/maxscale-system-test/cnf/maxscale.cnf.template.regexfilter1 +++ b/maxscale-system-test/cnf/maxscale.cnf.template.regexfilter1 @@ -14,7 +14,7 @@ type=service router=readconnroute servers=server1,server2,server3,server4 user=maxskysql -passwd=skysql +password=skysql filters=regex1 [Read Connection Listener 1] @@ -37,7 +37,7 @@ router=readconnroute router_options=slave servers=server1,server2,server3,server4 user=maxskysql -passwd=skysql +password=skysql filters=regex2 [Read Connection Listener 2] @@ -60,7 +60,7 @@ router=readconnroute router_options=master servers=server1,server2,server3,server4 user=maxskysql -passwd=skysql +password=skysql filters=regex3 [Read Connection Listener 3] @@ -74,7 +74,7 @@ type=monitor module=mysqlmon servers= server1,server2,server3,server4 user=maxskysql -passwd=skysql +password=skysql monitor_interval=1000 [server1] diff --git a/maxscale-system-test/cnf/maxscale.cnf.template.repl_lgc b/maxscale-system-test/cnf/maxscale.cnf.template.repl_lgc index e37da0555..b14f2f34c 100755 --- a/maxscale-system-test/cnf/maxscale.cnf.template.repl_lgc +++ b/maxscale-system-test/cnf/maxscale.cnf.template.repl_lgc @@ -7,7 +7,7 @@ type=monitor module=mysqlmon servers= server1, server2,server3 ,server4 user=maxskysql -passwd= skysql +password= skysql monitor_interval=1000 [RW Split Router] @@ -15,7 +15,7 @@ type=service router= readwritesplit servers=server1, server2, server3,server4 user=maxskysql -passwd=skysql +password=skysql router_options=slave_selection_criteria=LEAST_GLOBAL_CONNECTIONS max_slave_connections=1 @@ -25,7 +25,7 @@ router=readconnroute router_options= slave servers=server1,server2,server3,server4 user=maxskysql -passwd=skysql +password=skysql [Read Connection Router Master] type=service @@ -33,7 +33,7 @@ router=readconnroute router_options=master servers=server1,server2,server3,server4 user=maxskysql -passwd=skysql +password=skysql [RW Split Listener] type=listener diff --git a/maxscale-system-test/cnf/maxscale.cnf.template.replication b/maxscale-system-test/cnf/maxscale.cnf.template.replication index 2e087e71e..589b890ff 100755 --- a/maxscale-system-test/cnf/maxscale.cnf.template.replication +++ b/maxscale-system-test/cnf/maxscale.cnf.template.replication @@ -6,7 +6,7 @@ type=monitor module=mysqlmon servers=server1,server2,server3,server4 user=maxskysql -passwd=skysql +password=skysql monitor_interval=1000 detect_stale_master=false detect_standalone_master=false @@ -16,7 +16,7 @@ type=service router=readwritesplit servers=server1,server2,server3,server4 user=maxskysql -passwd=skysql +password=skysql router_options=slave_selection_criteria=LEAST_GLOBAL_CONNECTIONS max_slave_connections=1 @@ -26,7 +26,7 @@ router=readconnroute router_options=slave servers=server1,server2,server3,server4 user=maxskysql -passwd=skysql +password=skysql [Read Connection Router Master] type=service @@ -34,7 +34,7 @@ router=readconnroute router_options=master servers=server1,server2,server3,server4 user=maxskysql -passwd=skysql +password=skysql [RW Split Listener] type=listener diff --git a/maxscale-system-test/cnf/maxscale.cnf.template.replication.bug539 b/maxscale-system-test/cnf/maxscale.cnf.template.replication.bug539 index 938e1fc65..b335ed73c 100755 --- a/maxscale-system-test/cnf/maxscale.cnf.template.replication.bug539 +++ b/maxscale-system-test/cnf/maxscale.cnf.template.replication.bug539 @@ -14,7 +14,7 @@ max_slave_connections=100% use_sql_variables_in=master router_options=slave_selection_criteria=LEAST_BEHIND_MASTER user=maxskysql -passwd=skysql +password=skysql filters=hints [Client Interface] diff --git a/maxscale-system-test/cnf/maxscale.cnf.template.replication.one_slave b/maxscale-system-test/cnf/maxscale.cnf.template.replication.one_slave index cda21fb89..c295999cd 100755 --- a/maxscale-system-test/cnf/maxscale.cnf.template.replication.one_slave +++ b/maxscale-system-test/cnf/maxscale.cnf.template.replication.one_slave @@ -7,7 +7,7 @@ type=monitor module=mysqlmon servers=server1,server2,server3,server4 user=maxskysql -passwd=skysql +password=skysql [RW Split Router] type=service @@ -15,7 +15,7 @@ router=readwritesplit max_slave_connections=1 servers=server1,server2,server3,server4 user=maxskysql -passwd=skysql +password=skysql router_options=disable_sescmd_history=false [Read Connection Router Slave] @@ -24,7 +24,7 @@ router=readconnroute router_options=slave servers=server1,server2,server3,server4 user=maxskysql -passwd=skysql +password=skysql [Read Connection Router Master] type=service @@ -32,7 +32,7 @@ router=readconnroute router_options=master servers=server1,server2,server3,server4 user=maxskysql -passwd=skysql +password=skysql [RW Split Listener] type=listener diff --git a/maxscale-system-test/cnf/maxscale.cnf.template.replication_manager b/maxscale-system-test/cnf/maxscale.cnf.template.replication_manager index d685f2424..7280b9d90 100644 --- a/maxscale-system-test/cnf/maxscale.cnf.template.replication_manager +++ b/maxscale-system-test/cnf/maxscale.cnf.template.replication_manager @@ -7,7 +7,7 @@ type=monitor module=mysqlmon servers=server1,server2,server3,server4 user=maxskysql -passwd=skysql +password=skysql monitor_interval=1000 detect_standalone_master=true failcount=2 @@ -18,7 +18,7 @@ type=service router=readwritesplit servers=server1,server2,server3,server4 user=maxskysql -passwd=skysql +password=skysql master_failure_mode=fail_on_write [RW Split Listener] diff --git a/maxscale-system-test/cnf/maxscale.cnf.template.replication_manager_2nodes b/maxscale-system-test/cnf/maxscale.cnf.template.replication_manager_2nodes index 2cb70f249..f6b1eff0c 100644 --- a/maxscale-system-test/cnf/maxscale.cnf.template.replication_manager_2nodes +++ b/maxscale-system-test/cnf/maxscale.cnf.template.replication_manager_2nodes @@ -6,7 +6,7 @@ type=monitor module=mysqlmon servers=server1,server2 user=maxskysql -passwd=skysql +password=skysql monitor_interval=1000 detect_standalone_master=true failcount=2 @@ -18,7 +18,7 @@ router=readconnroute router_options=master servers=server1,server2 user=maxskysql -passwd=skysql +password=skysql [Traffic Listener] type=listener diff --git a/maxscale-system-test/cnf/maxscale.cnf.template.replication_manager_3nodes b/maxscale-system-test/cnf/maxscale.cnf.template.replication_manager_3nodes index 6c65d805d..4874e6dc1 100644 --- a/maxscale-system-test/cnf/maxscale.cnf.template.replication_manager_3nodes +++ b/maxscale-system-test/cnf/maxscale.cnf.template.replication_manager_3nodes @@ -6,7 +6,7 @@ type=monitor module=mysqlmon servers=server1,server2,server3 user=maxskysql -passwd=skysql +password=skysql monitor_interval=1000 detect_standalone_master=true failcount=2 @@ -18,7 +18,7 @@ router=readconnroute router_options=master servers=server1,server2,server3 user=maxskysql -passwd=skysql +password=skysql [Traffic-Listener] type=listener diff --git a/maxscale-system-test/cnf/maxscale.cnf.template.rwsplit_multi_stmt b/maxscale-system-test/cnf/maxscale.cnf.template.rwsplit_multi_stmt index 2d93946a6..2537783cb 100644 --- a/maxscale-system-test/cnf/maxscale.cnf.template.rwsplit_multi_stmt +++ b/maxscale-system-test/cnf/maxscale.cnf.template.rwsplit_multi_stmt @@ -7,7 +7,7 @@ type=monitor module=mysqlmon servers=server1,server2,server3,server4 user=maxskysql -passwd=skysql +password=skysql monitor_interval=1000 detect_stale_master=false @@ -16,7 +16,7 @@ type=service router=readwritesplit servers=server1,server2 user=maxskysql -passwd=skysql +password=skysql router_options=strict_multi_stmt=true [Read Connection Router Slave] @@ -25,7 +25,7 @@ router=readconnroute router_options=slave servers=server1,server2,server3,server4 user=maxskysql -passwd=skysql +password=skysql [Read Connection Router Master] type=service @@ -33,7 +33,7 @@ router=readconnroute router_options=master servers=server1,server2,server3,server4 user=maxskysql -passwd=skysql +password=skysql [RW Split Listener] type=listener diff --git a/maxscale-system-test/cnf/maxscale.cnf.template.rwsplit_read_only_trx b/maxscale-system-test/cnf/maxscale.cnf.template.rwsplit_read_only_trx index cdefbfcff..afd29c112 100755 --- a/maxscale-system-test/cnf/maxscale.cnf.template.rwsplit_read_only_trx +++ b/maxscale-system-test/cnf/maxscale.cnf.template.rwsplit_read_only_trx @@ -6,7 +6,7 @@ type=monitor module=mysqlmon servers=server1,server2,server3,server4 user=maxskysql -passwd=skysql +password=skysql monitor_interval=1000 [RW Split Router] @@ -14,7 +14,7 @@ type=service router=readwritesplit servers=server1,server2 user=maxskysql -passwd=skysql +password=skysql [Read Connection Router Slave] type=service @@ -22,7 +22,7 @@ router=readconnroute router_options=slave servers=server1,server2,server3,server4 user=maxskysql -passwd=skysql +password=skysql [Read Connection Router Master] type=service @@ -30,7 +30,7 @@ router=readconnroute router_options=master servers=server1,server2,server3,server4 user=maxskysql -passwd=skysql +password=skysql [RW Split Listener] type=listener diff --git a/maxscale-system-test/cnf/maxscale.cnf.template.rwsplit_readonly b/maxscale-system-test/cnf/maxscale.cnf.template.rwsplit_readonly index 248d18ee7..0bcf17af6 100644 --- a/maxscale-system-test/cnf/maxscale.cnf.template.rwsplit_readonly +++ b/maxscale-system-test/cnf/maxscale.cnf.template.rwsplit_readonly @@ -6,7 +6,7 @@ type=monitor module=mysqlmon servers=server1,server2,server3,server4 user=maxskysql -passwd=skysql +password=skysql monitor_interval=1000 [RW Split Router] @@ -14,7 +14,7 @@ type=service router=readwritesplit servers=server1,server2,server3,server4 user=maxskysql -passwd=skysql +password=skysql router_options=master_failure_mode=fail_instantly [Read Connection Router Slave] @@ -22,7 +22,7 @@ type=service router=readwritesplit servers=server1,server2,server3,server4 user=maxskysql -passwd=skysql +password=skysql router_options=master_failure_mode=error_on_write [Read Connection Router Master] @@ -30,7 +30,7 @@ type=service router=readwritesplit servers=server1,server2,server3,server4 user=maxskysql -passwd=skysql +password=skysql router_options=master_failure_mode=fail_on_write [RW Split Listener] diff --git a/maxscale-system-test/cnf/maxscale.cnf.template.schemarouter_duplicate b/maxscale-system-test/cnf/maxscale.cnf.template.schemarouter_duplicate index 30b9659ad..8a8cf1724 100755 --- a/maxscale-system-test/cnf/maxscale.cnf.template.schemarouter_duplicate +++ b/maxscale-system-test/cnf/maxscale.cnf.template.schemarouter_duplicate @@ -7,14 +7,14 @@ type=monitor module=mysqlmon servers=server1,server2,server3,server4 user=maxskysql -passwd=skysql +password=skysql [Sharding router] type=service router=schemarouter servers=server1,server2,server3,server4 user=maxskysql -passwd=skysql +password=skysql auth_all_servers=1 [Sharding Listener] diff --git a/maxscale-system-test/cnf/maxscale.cnf.template.script b/maxscale-system-test/cnf/maxscale.cnf.template.script index c6b1a3f8f..6bd60549a 100755 --- a/maxscale-system-test/cnf/maxscale.cnf.template.script +++ b/maxscale-system-test/cnf/maxscale.cnf.template.script @@ -7,7 +7,7 @@ type=monitor module=mysqlmon servers= server1, server2,server3 ,server4 user=maxskysql -passwd= skysql +password= skysql 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 monitor_interval=1000 @@ -21,7 +21,7 @@ events=master_down,master_up, slave_up, server_down ,server_up,lost_master,lo disable_master_role_setting=true root_node_as_master=false user=maxskysql -passwd=skysql +password=skysql monitor_interval=1000 [RW Split Router] @@ -29,7 +29,7 @@ type=service router= readwritesplit servers=server1, server2, server3,server4 user=maxskysql -passwd=skysql +password=skysql router_options=slave_selection_criteria=LEAST_ROUTER_CONNECTIONS [RW Split Router Galera] @@ -37,7 +37,7 @@ type=service router= readwritesplit servers=gserver1,gserver2,gserver3,gserver4 user=maxskysql -passwd=skysql +password=skysql router_options=slave_selection_criteria=LEAST_ROUTER_CONNECTIONS [Read Connection Router Slave] @@ -46,7 +46,7 @@ router=readconnroute router_options= slave servers=server1,server2,server3,server4 user=maxskysql -passwd=skysql +password=skysql [Read Connection Router Master] type=service @@ -54,7 +54,7 @@ router=readconnroute router_options=master servers=server1,server2,server3,server4 user=maxskysql -passwd=skysql +password=skysql [RW Split Listener] type=listener diff --git a/maxscale-system-test/cnf/maxscale.cnf.template.session_limits b/maxscale-system-test/cnf/maxscale.cnf.template.session_limits index c70846b20..785bab8ef 100755 --- a/maxscale-system-test/cnf/maxscale.cnf.template.session_limits +++ b/maxscale-system-test/cnf/maxscale.cnf.template.session_limits @@ -7,7 +7,7 @@ type=monitor module=mysqlmon servers= server1, server2,server3 ,server4 user=maxskysql -passwd= skysql +password= skysql [RW Split Router] connection_timeout=10 @@ -15,7 +15,7 @@ type=service router= readwritesplit servers=server1, server2, server3,server4 user=maxskysql -passwd=skysql +password=skysql router_options=slave_selection_criteria=LEAST_ROUTER_CONNECTIONS,max_sescmd_history=10,disable_sescmd_history=false [Read Connection Router Slave] @@ -24,7 +24,7 @@ router=readconnroute router_options= slave servers=server1,server2,server3,server4 user=maxskysql -passwd=skysql +password=skysql [Read Connection Router Master] type=service @@ -32,7 +32,7 @@ router=readconnroute router_options=master servers=server1,server2,server3,server4 user=maxskysql -passwd=skysql +password=skysql [RW Split Listener] type=listener diff --git a/maxscale-system-test/cnf/maxscale.cnf.template.setup_binlog b/maxscale-system-test/cnf/maxscale.cnf.template.setup_binlog index 81985d120..0f7262a10 100755 --- a/maxscale-system-test/cnf/maxscale.cnf.template.setup_binlog +++ b/maxscale-system-test/cnf/maxscale.cnf.template.setup_binlog @@ -6,7 +6,7 @@ log_warning=1 type=service router=binlogrouter user=skysql -passwd=skysql +password=skysql #version_string=5.6.15-log #router_options=server-id=3,user=repl,password=repl,master-id=1 router_options=server-id=9993,send_slave_heartbeat=On,user=repl,password=repl,longburst=500,heartbeat=10,binlogdir=/var/lib/maxscale/Binlog_Service,mariadb10-compatibility=1 diff --git a/maxscale-system-test/cnf/maxscale.cnf.template.setup_binlog.in b/maxscale-system-test/cnf/maxscale.cnf.template.setup_binlog.in index 81985d120..0f7262a10 100755 --- a/maxscale-system-test/cnf/maxscale.cnf.template.setup_binlog.in +++ b/maxscale-system-test/cnf/maxscale.cnf.template.setup_binlog.in @@ -6,7 +6,7 @@ log_warning=1 type=service router=binlogrouter user=skysql -passwd=skysql +password=skysql #version_string=5.6.15-log #router_options=server-id=3,user=repl,password=repl,master-id=1 router_options=server-id=9993,send_slave_heartbeat=On,user=repl,password=repl,longburst=500,heartbeat=10,binlogdir=/var/lib/maxscale/Binlog_Service,mariadb10-compatibility=1 diff --git a/maxscale-system-test/cnf/maxscale.cnf.template.setup_binlog1 b/maxscale-system-test/cnf/maxscale.cnf.template.setup_binlog1 index ee369a8f3..bdd25474a 100755 --- a/maxscale-system-test/cnf/maxscale.cnf.template.setup_binlog1 +++ b/maxscale-system-test/cnf/maxscale.cnf.template.setup_binlog1 @@ -6,7 +6,7 @@ log_warning=1 type=service router=binlogrouter user=skysql -passwd=skysql +password=skysql #version_string=5.6.15-log #router_options=server-id=3,user=repl,password=repl,master-id=1 router_options=server-id=9993,send_slave_heartbeat=On,longburst=500,heartbeat=10,binlogdir=/var/lib/maxscale/Binlog_Service,mariadb10-compatibility=1 diff --git a/maxscale-system-test/cnf/maxscale.cnf.template.setup_binlog2 b/maxscale-system-test/cnf/maxscale.cnf.template.setup_binlog2 index 0d03663a3..4a8bc6048 100755 --- a/maxscale-system-test/cnf/maxscale.cnf.template.setup_binlog2 +++ b/maxscale-system-test/cnf/maxscale.cnf.template.setup_binlog2 @@ -7,7 +7,7 @@ log_trace=1 type=service router=binlogrouter user=skysql -passwd=skysql +password=skysql #version_string=5.6.15-log #router_options=server-id=3,user=repl,password=repl,master-id=1 router_options=server-id=9993,send_slave_heartbeat=On,user=repl,password=repl,longburst=500,heartbeat=10,binlogdir=/var/lib/maxscale/Binlog_Service,transaction_safety=1,mariadb10-compatibility=1 diff --git a/maxscale-system-test/cnf/maxscale.cnf.template.setup_binlog_gtid b/maxscale-system-test/cnf/maxscale.cnf.template.setup_binlog_gtid index b74cbdbe2..aa40d4bf4 100755 --- a/maxscale-system-test/cnf/maxscale.cnf.template.setup_binlog_gtid +++ b/maxscale-system-test/cnf/maxscale.cnf.template.setup_binlog_gtid @@ -6,7 +6,7 @@ log_warning=1 type=service router=binlogrouter user=skysql -passwd=skysql +password=skysql version_string=5.6.15-log #router_options=server-id=3,user=repl,password=repl,master-id=1 router_options=server_id=3,user=repl,password=repl,longburst=500,heartbeat=30,binlogdir=/var/lib/maxscale/Binlog_Service,mariadb10_master_gtid=on,mariadb10_slave_gtid=on,transaction_safety=on,mariadb10-compatibility=1 diff --git a/maxscale-system-test/cnf/maxscale.cnf.template.setup_binlog_semisync b/maxscale-system-test/cnf/maxscale.cnf.template.setup_binlog_semisync index 76a8f6910..5c396abfd 100755 --- a/maxscale-system-test/cnf/maxscale.cnf.template.setup_binlog_semisync +++ b/maxscale-system-test/cnf/maxscale.cnf.template.setup_binlog_semisync @@ -7,7 +7,7 @@ type=service router=binlogrouter #servers=master user=skysql -passwd=skysql +password=skysql #version_string=5.6.15-log #router_options=server-id=3,user=repl,password=repl,master-id=1 router_options=server-id=9993,send_slave_heartbeat=On,user=repl,password=repl,longburst=500,heartbeat=10,binlogdir=/var/lib/maxscale/Binlog_Service,semisync=1,transaction_safety=1,mariadb10-compatibility=1 diff --git a/maxscale-system-test/cnf/maxscale.cnf.template.setup_binlog_semisync_txs0_ss0 b/maxscale-system-test/cnf/maxscale.cnf.template.setup_binlog_semisync_txs0_ss0 index 4f55f4ec9..487d7b573 100755 --- a/maxscale-system-test/cnf/maxscale.cnf.template.setup_binlog_semisync_txs0_ss0 +++ b/maxscale-system-test/cnf/maxscale.cnf.template.setup_binlog_semisync_txs0_ss0 @@ -7,7 +7,7 @@ type=service router=binlogrouter #servers=master user=skysql -passwd=skysql +password=skysql #version_string=5.6.15-log #router_options=server-id=3,user=repl,password=repl,master-id=1 router_options=server-id=9993,send_slave_heartbeat=On,user=repl,password=repl,longburst=500,heartbeat=10,binlogdir=/var/lib/maxscale/Binlog_Service,semisync=0,transaction_safety=0,mariadb10-compatibility=1 diff --git a/maxscale-system-test/cnf/maxscale.cnf.template.setup_binlog_semisync_txs0_ss1 b/maxscale-system-test/cnf/maxscale.cnf.template.setup_binlog_semisync_txs0_ss1 index 8c0267ddc..f4722f210 100755 --- a/maxscale-system-test/cnf/maxscale.cnf.template.setup_binlog_semisync_txs0_ss1 +++ b/maxscale-system-test/cnf/maxscale.cnf.template.setup_binlog_semisync_txs0_ss1 @@ -7,7 +7,7 @@ type=service router=binlogrouter #servers=master user=skysql -passwd=skysql +password=skysql #version_string=5.6.15-log #router_options=server-id=3,user=repl,password=repl,master-id=1 router_options=server-id=9993,send_slave_heartbeat=On,user=repl,password=repl,longburst=500,heartbeat=10,binlogdir=/var/lib/maxscale/Binlog_Service,semisync=1,transaction_safety=0,mariadb10-compatibility=1 diff --git a/maxscale-system-test/cnf/maxscale.cnf.template.setup_binlog_semisync_txs1_ss0 b/maxscale-system-test/cnf/maxscale.cnf.template.setup_binlog_semisync_txs1_ss0 index 20f30f984..8610454dd 100755 --- a/maxscale-system-test/cnf/maxscale.cnf.template.setup_binlog_semisync_txs1_ss0 +++ b/maxscale-system-test/cnf/maxscale.cnf.template.setup_binlog_semisync_txs1_ss0 @@ -7,7 +7,7 @@ type=service router=binlogrouter #servers=master user=skysql -passwd=skysql +password=skysql #version_string=5.6.15-log #router_options=server-id=3,user=repl,password=repl,master-id=1 router_options=server-id=9993,send_slave_heartbeat=On,user=repl,password=repl,longburst=500,heartbeat=10,binlogdir=/var/lib/maxscale/Binlog_Service,semisync=0,transaction_safety=1,mariadb10-compatibility=1 diff --git a/maxscale-system-test/cnf/maxscale.cnf.template.setup_binlog_tx_safe b/maxscale-system-test/cnf/maxscale.cnf.template.setup_binlog_tx_safe index 6a1078fc9..fe5a7ba9b 100755 --- a/maxscale-system-test/cnf/maxscale.cnf.template.setup_binlog_tx_safe +++ b/maxscale-system-test/cnf/maxscale.cnf.template.setup_binlog_tx_safe @@ -7,7 +7,7 @@ type=service router=binlogrouter #servers=master user=skysql -passwd=skysql +password=skysql #version_string=5.6.15-log #router_options=server-id=3,user=repl,password=repl,master-id=1 router_options=server-id=9993,send_slave_heartbeat=On,user=repl,password=repl,longburst=500,heartbeat=10,binlogdir=/var/lib/maxscale/Binlog_Service,transaction_safety=1,mariadb10-compatibility=1 diff --git a/maxscale-system-test/cnf/maxscale.cnf.template.setup_binlog_tx_safe_gtid b/maxscale-system-test/cnf/maxscale.cnf.template.setup_binlog_tx_safe_gtid index de234f2b4..4f2f3002d 100755 --- a/maxscale-system-test/cnf/maxscale.cnf.template.setup_binlog_tx_safe_gtid +++ b/maxscale-system-test/cnf/maxscale.cnf.template.setup_binlog_tx_safe_gtid @@ -7,7 +7,7 @@ type=service router=binlogrouter #servers=master user=skysql -passwd=skysql +password=skysql version_string=5.6.15-log #router_options=server-id=3,user=repl,password=repl,master-id=1 router_options=server-id=3,user=repl,password=repl,longburst=500,heartbeat=30,binlogdir=/var/lib/maxscale/Binlog_Service,mariadb10_master_gtid=on,mariadb10_slave_gtid=on,transaction_safety=on,mariadb10-compatibility=1 diff --git a/maxscale-system-test/cnf/maxscale.cnf.template.sharding b/maxscale-system-test/cnf/maxscale.cnf.template.sharding index 4287a0d29..9d8a99454 100755 --- a/maxscale-system-test/cnf/maxscale.cnf.template.sharding +++ b/maxscale-system-test/cnf/maxscale.cnf.template.sharding @@ -7,14 +7,14 @@ type=monitor module=mysqlmon servers=server1,server2,server3,server4 user=maxskysql -passwd=skysql +password=skysql [Sharding router] type=service router=schemarouter servers=server1,server2,server3,server4 user=maxskysql -passwd=skysql +password=skysql auth_all_servers=1 ignore_databases_regex=.* diff --git a/maxscale-system-test/cnf/maxscale.cnf.template.show_monitor_crash b/maxscale-system-test/cnf/maxscale.cnf.template.show_monitor_crash index ccaadf932..1af5d3cd4 100755 --- a/maxscale-system-test/cnf/maxscale.cnf.template.show_monitor_crash +++ b/maxscale-system-test/cnf/maxscale.cnf.template.show_monitor_crash @@ -7,7 +7,7 @@ type=monitor module=mysqlmon servers= server1, server2,server3 ,server4 user=maxskysql_bad -passwd= skysql +password= skysql monitor_interval=1000 detect_stale_master=false @@ -16,7 +16,7 @@ type=service router= readwritesplit servers=server1, server2, server3,server4 user=maxskysql -passwd=skysql +password=skysql router_options=slave_selection_criteria=LEAST_GLOBAL_CONNECTIONS max_slave_connections=1 @@ -26,7 +26,7 @@ router=readconnroute router_options= slave servers=server1,server2,server3,server4 user=maxskysql -passwd=skysql +password=skysql [Read Connection Router Master] type=service @@ -34,7 +34,7 @@ router=readconnroute router_options=master servers=server1,server2,server3,server4 user=maxskysql -passwd=skysql +password=skysql [RW Split Listener] type=listener diff --git a/maxscale-system-test/cnf/maxscale.cnf.template.simplejavatest b/maxscale-system-test/cnf/maxscale.cnf.template.simplejavatest index 66154fb5d..829fba049 100644 --- a/maxscale-system-test/cnf/maxscale.cnf.template.simplejavatest +++ b/maxscale-system-test/cnf/maxscale.cnf.template.simplejavatest @@ -7,7 +7,7 @@ type=monitor module=mysqlmon servers= server1, server2,server3 ,server4 user=maxskysql -passwd= skysql +password= skysql monitor_interval=1000 [RW Split Router] @@ -15,7 +15,7 @@ type=service router= readwritesplit servers=server1, server2, server3,server4 user=maxskysql -passwd=skysql +password=skysql router_options=slave_selection_criteria=LEAST_GLOBAL_CONNECTIONS max_slave_connections=1 version_string=5.5.5-10.0.0-mxs @@ -26,7 +26,7 @@ router=readconnroute router_options= slave servers=server1,server2,server3,server4 user=maxskysql -passwd=skysql +password=skysql version_string=5.5.5-10.0.0-mxs [Read Connection Router Master] @@ -35,7 +35,7 @@ router=readconnroute router_options=master servers=server1,server2,server3,server4 user=maxskysql -passwd=skysql +password=skysql version_string=5.5.5-10.0.0-mxs [RW Split Listener] diff --git a/maxscale-system-test/cnf/maxscale.cnf.template.sql_queries_pers1 b/maxscale-system-test/cnf/maxscale.cnf.template.sql_queries_pers1 index ab1049e55..326ba4583 100755 --- a/maxscale-system-test/cnf/maxscale.cnf.template.sql_queries_pers1 +++ b/maxscale-system-test/cnf/maxscale.cnf.template.sql_queries_pers1 @@ -7,7 +7,7 @@ type=monitor module=mysqlmon servers= server1, server2,server3 ,server4 user=maxskysql -passwd= skysql +password= skysql monitor_interval=1000 [RW Split Router] @@ -15,7 +15,7 @@ type=service router= readwritesplit servers=server1, server2, server3,server4 user=maxskysql -passwd=skysql +password=skysql router_options=slave_selection_criteria=LEAST_ROUTER_CONNECTIONS max_slave_connections=1 @@ -25,7 +25,7 @@ router=readconnroute router_options= slave servers=server1,server2,server3,server4 user=maxskysql -passwd=skysql +password=skysql [Read Connection Router Master] type=service @@ -33,7 +33,7 @@ router=readconnroute router_options=master servers=server1,server2,server3,server4 user=maxskysql -passwd=skysql +password=skysql [RW Split Listener] type=listener diff --git a/maxscale-system-test/cnf/maxscale.cnf.template.sql_queries_pers10 b/maxscale-system-test/cnf/maxscale.cnf.template.sql_queries_pers10 index c661679df..2db44e17f 100755 --- a/maxscale-system-test/cnf/maxscale.cnf.template.sql_queries_pers10 +++ b/maxscale-system-test/cnf/maxscale.cnf.template.sql_queries_pers10 @@ -7,7 +7,7 @@ type=monitor module=mysqlmon servers= server1, server2,server3 ,server4 user=maxskysql -passwd= skysql +password= skysql monitor_interval=1000 [RW Split Router] @@ -15,7 +15,7 @@ type=service router= readwritesplit servers=server1, server2, server3,server4 user=maxskysql -passwd=skysql +password=skysql router_options=slave_selection_criteria=LEAST_ROUTER_CONNECTIONS max_slave_connections=1 @@ -25,7 +25,7 @@ router=readconnroute router_options= slave servers=server1,server2,server3,server4 user=maxskysql -passwd=skysql +password=skysql [Read Connection Router Master] type=service @@ -33,7 +33,7 @@ router=readconnroute router_options=master servers=server1,server2,server3,server4 user=maxskysql -passwd=skysql +password=skysql [RW Split Listener] type=listener diff --git a/maxscale-system-test/cnf/maxscale.cnf.template.ssl b/maxscale-system-test/cnf/maxscale.cnf.template.ssl index 38e22e9e8..19166fc53 100755 --- a/maxscale-system-test/cnf/maxscale.cnf.template.ssl +++ b/maxscale-system-test/cnf/maxscale.cnf.template.ssl @@ -7,14 +7,14 @@ type=monitor module=mysqlmon servers= server1, server2,server3 ,server4 user=maxskysql -passwd= skysql +password= skysql [RW Split Router] type=service router= readwritesplit servers=server1, server2, server3,server4 user=maxskysql -passwd=skysql +password=skysql router_options=slave_selection_criteria=LEAST_ROUTER_CONNECTIONS [Read Connection Router Slave] @@ -23,7 +23,7 @@ router=readconnroute router_options= slave servers=server1,server2,server3,server4 user=maxskysql -passwd=skysql +password=skysql [Read Connection Router Master] type=service @@ -31,7 +31,7 @@ router=readconnroute router_options=master servers=server1,server2,server3,server4 user=maxskysql -passwd=skysql +password=skysql [RW Split Listener] type=listener diff --git a/maxscale-system-test/cnf/maxscale.cnf.template.ssl_load b/maxscale-system-test/cnf/maxscale.cnf.template.ssl_load index f5af0a2d3..6ee5c0452 100755 --- a/maxscale-system-test/cnf/maxscale.cnf.template.ssl_load +++ b/maxscale-system-test/cnf/maxscale.cnf.template.ssl_load @@ -7,14 +7,14 @@ type=monitor module=mysqlmon servers= server1, server2,server3 ,server4 user=maxskysql -passwd= skysql +password= skysql [RW Split Router] type=service router= readwritesplit servers=server1,server2,server3,server4 user=maxskysql -passwd=skysql +password=skysql max_slave_connections=100% router_options=slave_selection_criteria=LEAST_CURRENT_OPERATIONS @@ -24,7 +24,7 @@ router=readconnroute router_options= slave servers=server1,server2,server3,server4 user=maxskysql -passwd=skysql +password=skysql [Read Connection Router Master] type=service @@ -32,7 +32,7 @@ router=readconnroute router_options=master servers=server1,server2,server3,server4 user=maxskysql -passwd=skysql +password=skysql [RW Split Listener] type=listener diff --git a/maxscale-system-test/cnf/maxscale.cnf.template.ssl_load_galera b/maxscale-system-test/cnf/maxscale.cnf.template.ssl_load_galera index 477816318..6e2791bd2 100755 --- a/maxscale-system-test/cnf/maxscale.cnf.template.ssl_load_galera +++ b/maxscale-system-test/cnf/maxscale.cnf.template.ssl_load_galera @@ -7,7 +7,7 @@ type=monitor module=galeramon servers=server1,server2,server3,server4 user=maxskysql -passwd=skysql +password=skysql root_node_as_master=false [RW Split Router] @@ -15,7 +15,7 @@ type=service router= readwritesplit servers=server1,server2,server3,server4 user=maxskysql -passwd=skysql +password=skysql max_slave_connections=100% router_options=slave_selection_criteria=LEAST_CURRENT_OPERATIONS @@ -25,7 +25,7 @@ router=readconnroute router_options= slave servers=server1,server2,server3,server4 user=maxskysql -passwd=skysql +password=skysql [Read Connection Router Master] type=service @@ -33,7 +33,7 @@ router=readconnroute router_options=master servers=server1,server2,server3,server4 user=maxskysql -passwd=skysql +password=skysql [RW Split Listener] type=listener diff --git a/maxscale-system-test/cnf/maxscale.cnf.template.user_cache b/maxscale-system-test/cnf/maxscale.cnf.template.user_cache index efcd24883..ba90b15bd 100644 --- a/maxscale-system-test/cnf/maxscale.cnf.template.user_cache +++ b/maxscale-system-test/cnf/maxscale.cnf.template.user_cache @@ -7,7 +7,7 @@ type=monitor module=mysqlmon servers= server1,server2,server3,server4 user=maxskysql -passwd= skysql +password= skysql monitor_interval=1000 detect_stale_master=false @@ -20,7 +20,7 @@ type=service router= readwritesplit servers=server1,server2,server3,server4 user=testuser -passwd=testpasswd +password=testpasswd [Read Connection Router Master] type=service @@ -28,7 +28,7 @@ router=readconnroute router_options=master servers=server1,server2,server3,server4 user=testuser -passwd=testpasswd +password=testpasswd [RW Split Listener] type=listener diff --git a/maxscale-system-test/cnf/maxscale.cnf.template.verify_master_failure b/maxscale-system-test/cnf/maxscale.cnf.template.verify_master_failure index 98e6b884a..dbaf703fb 100644 --- a/maxscale-system-test/cnf/maxscale.cnf.template.verify_master_failure +++ b/maxscale-system-test/cnf/maxscale.cnf.template.verify_master_failure @@ -7,7 +7,7 @@ type=monitor module=mysqlmon servers=server1,server2,server3,server4 user=maxskysql -passwd=skysql +password=skysql monitor_interval=1000 auto_failover=true @@ -16,7 +16,7 @@ type=service router=readwritesplit servers=server1,server2,server3,server4 user=maxskysql -passwd=skysql +password=skysql [RW Split Listener] type=listener diff --git a/maxscale-system-test/config_test.cpp b/maxscale-system-test/config_test.cpp index 35d27dede..c257c5879 100644 --- a/maxscale-system-test/config_test.cpp +++ b/maxscale-system-test/config_test.cpp @@ -21,6 +21,7 @@ const char *bad_configs[] = "mxs720_wierd_line", "mxs799", "mxs1731_empty_param", + "old_passwd", NULL }; diff --git a/maxscale-system-test/encrypted_passwords.cpp b/maxscale-system-test/encrypted_passwords.cpp index bd752038c..046de532f 100644 --- a/maxscale-system-test/encrypted_passwords.cpp +++ b/maxscale-system-test/encrypted_passwords.cpp @@ -52,7 +52,7 @@ int hash_password(TestConnections *test) test->tprintf("Encrypted password is: %s\n", enc_pw); test->maxscales->ssh_node_f(0, true, - "sed -i -e 's/passwd[[:space:]]*=[[:space:]]*skysql/passwd=%s/' /etc/maxscale.cnf", + "sed -i -e 's/password[[:space:]]*=[[:space:]]*skysql/password=%s/' /etc/maxscale.cnf", enc_pw); free(enc_pw); diff --git a/maxscale-system-test/mxs822_maxpasswd.cpp b/maxscale-system-test/mxs822_maxpasswd.cpp index 6340c68ee..502f81449 100644 --- a/maxscale-system-test/mxs822_maxpasswd.cpp +++ b/maxscale-system-test/mxs822_maxpasswd.cpp @@ -34,11 +34,11 @@ void try_password(TestConnections* Test, char * pass) int rc = Test->maxscales->ssh_node_f(0, true, "maxpasswd /var/lib/maxscale/ '%s' | tr -dc '[:xdigit:]' > /tmp/pw.txt && " "sed -i 's/user=.*/user=test/' /etc/maxscale.cnf && " - "sed -i \"s/passwd=.*/passwd=$(cat /tmp/pw.txt)/\" /etc/maxscale.cnf && " + "sed -i \"s/password=.*/password=$(cat /tmp/pw.txt)/\" /etc/maxscale.cnf && " "service maxscale restart && " "sleep 3 && " "sed -i 's/user=.*/user=maxskysql/' /etc/maxscale.cnf && " - "sed -i 's/passwd=.*/passwd=skysql/' /etc/maxscale.cnf && " + "sed -i 's/password=.*/password=skysql/' /etc/maxscale.cnf && " "service maxscale restart", pass); Test->add_result(rc, "Failed to encrypt password '%s'", pass);