diff --git a/manifests/database/sql/mysql.pp b/manifests/database/sql/mysql.pp index 4818e9dd..f729b1c7 100644 --- a/manifests/database/sql/mysql.pp +++ b/manifests/database/sql/mysql.pp @@ -443,7 +443,7 @@ class cloud::database::sql::mysql ( changes => [ 'ins service-name after service-name[last()]', 'set service-name[last()] "mysqlchk"', - 'set service-name[. = "mysqlchk"]/port 9200', + 'set service-name[. = "mysqlchk"]/port 8200', 'set service-name[. = "mysqlchk"]/protocol tcp', ], onlyif => 'match service-name[. = "mysqlchk"] size == 0', @@ -491,7 +491,7 @@ class cloud::database::sql::mysql ( extras => $firewall_settings, } cloud::firewall::rule{ '100 allow mysqlchk access': - port => '9200', + port => '8200', extras => $firewall_settings, } cloud::firewall::rule{ '100 allow mysql rsync access': @@ -506,7 +506,7 @@ class cloud::database::sql::mysql ( ipaddresses => $api_eth, ports => '3306', options => - inline_template('check inter 2000 rise 2 fall 5 port 9200 <% if @hostname != @galera_master_name -%>backup<% end %>') + inline_template('check inter 2000 rise 2 fall 5 port 8200 <% if @hostname != @galera_master_name -%>backup<% end %>') } @@haproxy::balancermember{"${::fqdn}-readonly": @@ -515,6 +515,6 @@ class cloud::database::sql::mysql ( ipaddresses => $api_eth, ports => '3306', options => - inline_template('check inter 2000 rise 2 fall 5 port 9200 <% if @hostname == @galera_master_name -%>backup<% end %>') + inline_template('check inter 2000 rise 2 fall 5 port 8200 <% if @hostname == @galera_master_name -%>backup<% end %>') } } diff --git a/spec/classes/cloud_database_sql_mysql_spec.rb b/spec/classes/cloud_database_sql_mysql_spec.rb index 6d5d0c18..631a90a3 100644 --- a/spec/classes/cloud_database_sql_mysql_spec.rb +++ b/spec/classes/cloud_database_sql_mysql_spec.rb @@ -211,7 +211,7 @@ describe 'cloud::database::sql::mysql' do :action => 'accept', ) is_expected.to contain_firewall('100 allow mysqlchk access').with( - :port => '9200', + :port => '8200', :proto => 'tcp', :action => 'accept', ) @@ -238,7 +238,7 @@ describe 'cloud::database::sql::mysql' do :limit => '50/sec', ) is_expected.to contain_firewall('100 allow mysqlchk access').with( - :port => '9200', + :port => '8200', :proto => 'tcp', :action => 'accept', :limit => '50/sec', diff --git a/templates/database/mysqlchk.erb b/templates/database/mysqlchk.erb index ef047375..2786eb88 100644 --- a/templates/database/mysqlchk.erb +++ b/templates/database/mysqlchk.erb @@ -9,7 +9,7 @@ service mysqlchk disable = no flags = REUSE socket_type = stream - port = 9200 + port = 8200 wait = no user = nobody server = /usr/bin/clustercheck