stackforge/puppet-openstack-cloud
Code Issues Proposed changes

Merge "Change mysqlchk xinetd script port"

Browse Source
This commit is contained in:
Jenkins
2015-02-06 10:35:00 +00:00
committed by Gerrit Code Review
parent 50112e7c03 0849647908
commit 37ea263506
3 changed files with 7 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
manifests/database/sql/mysql.pp
View File

@@ -443,7 +443,7 @@ class cloud::database::sql::mysql (
changes => [ changes => [
'ins service-name after service-name[last()]', 'ins service-name after service-name[last()]',
'set service-name[last()] "mysqlchk"', 'set service-name[last()] "mysqlchk"',
'set service-name[. = "mysqlchk"]/port 9200', 'set service-name[. = "mysqlchk"]/port 8200',
'set service-name[. = "mysqlchk"]/protocol tcp', 'set service-name[. = "mysqlchk"]/protocol tcp',
], ],
onlyif => 'match service-name[. = "mysqlchk"] size == 0', onlyif => 'match service-name[. = "mysqlchk"] size == 0',
@@ -491,7 +491,7 @@ class cloud::database::sql::mysql (
extras => $firewall_settings, extras => $firewall_settings,
} }
cloud::firewall::rule{ '100 allow mysqlchk access': cloud::firewall::rule{ '100 allow mysqlchk access':
port => '9200', port => '8200',
extras => $firewall_settings, extras => $firewall_settings,
} }
cloud::firewall::rule{ '100 allow mysql rsync access': cloud::firewall::rule{ '100 allow mysql rsync access':
@@ -506,7 +506,7 @@ class cloud::database::sql::mysql (
ipaddresses => $api_eth, ipaddresses => $api_eth,
ports => '3306', ports => '3306',
options => 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": @@haproxy::balancermember{"${::fqdn}-readonly":
@@ -515,6 +515,6 @@ class cloud::database::sql::mysql (
ipaddresses => $api_eth, ipaddresses => $api_eth,
ports => '3306', ports => '3306',
options => 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 %>')
} }
} }

4
spec/classes/cloud_database_sql_mysql_spec.rb
View File

@@ -211,7 +211,7 @@ describe 'cloud::database::sql::mysql' do
:action => 'accept', :action => 'accept',
) )
is_expected.to contain_firewall('100 allow mysqlchk access').with( is_expected.to contain_firewall('100 allow mysqlchk access').with(
:port => '9200', :port => '8200',
:proto => 'tcp', :proto => 'tcp',
:action => 'accept', :action => 'accept',
) )
@@ -238,7 +238,7 @@ describe 'cloud::database::sql::mysql' do
:limit => '50/sec', :limit => '50/sec',
) )
is_expected.to contain_firewall('100 allow mysqlchk access').with( is_expected.to contain_firewall('100 allow mysqlchk access').with(
:port => '9200', :port => '8200',
:proto => 'tcp', :proto => 'tcp',
:action => 'accept', :action => 'accept',
:limit => '50/sec', :limit => '50/sec',

2
templates/database/mysqlchk.erb
View File

@@ -9,7 +9,7 @@ service mysqlchk
disable = no disable = no
flags = REUSE flags = REUSE
socket_type = stream socket_type = stream
port = 9200 port = 8200
wait = no wait = no
user = nobody user = nobody
server = /usr/bin/clustercheck server = /usr/bin/clustercheck