From d7a95eb84027e82c251ef6296ac4656a367f06af Mon Sep 17 00:00:00 2001 From: Christian Berendt Date: Sat, 21 Mar 2015 21:43:24 +0100 Subject: [PATCH] Change default value of 'galera_clustercheck_dbuser' to 'clustercheck' The current default value of galera_clustercheck_dbuser in the class cloud::database::sql::mysql does not makes sense because of the following issue. Parameter name failed on Mysql_user[clustercheckdbuser@localhost]: MySQL usernames are limited to a maximum of 16 characters Change-Id: I5be0c5d1cccc3f054e134602239b91d59e863492 --- manifests/database/sql/mysql.pp | 4 ++-- spec/classes/cloud_database_sql_mysql_spec.rb | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/manifests/database/sql/mysql.pp b/manifests/database/sql/mysql.pp index 7978bf77..1b819ec8 100644 --- a/manifests/database/sql/mysql.pp +++ b/manifests/database/sql/mysql.pp @@ -159,7 +159,7 @@ # # [*galera_clustercheck_dbuser*] # (optional) The MySQL username for Galera cluster check (using monitoring database) -# Defaults to 'clustercheckdbuser' +# Defaults to 'clustercheck' # # [*galera_clustercheck_dbpassword*] # (optional) The MySQL password for Galera cluster check @@ -218,7 +218,7 @@ class cloud::database::sql::mysql ( $trove_db_allowed_hosts = ['127.0.0.1'], $mysql_root_password = 'rootpassword', $mysql_sys_maint_password = 'sys_maint', - $galera_clustercheck_dbuser = 'clustercheckdbuser', + $galera_clustercheck_dbuser = 'clustercheck', $galera_clustercheck_dbpassword = 'clustercheckpassword', $galera_clustercheck_ipaddress = '127.0.0.1', $open_files_limit = 65535, diff --git a/spec/classes/cloud_database_sql_mysql_spec.rb b/spec/classes/cloud_database_sql_mysql_spec.rb index 09ed68c2..d271d9d3 100644 --- a/spec/classes/cloud_database_sql_mysql_spec.rb +++ b/spec/classes/cloud_database_sql_mysql_spec.rb @@ -62,7 +62,7 @@ describe 'cloud::database::sql::mysql' do :trove_db_allowed_hosts => ['10.0.0.1','10.0.0.2','10.0.0.3'], :mysql_root_password => 'secrete', :mysql_sys_maint_password => 'sys', - :galera_clustercheck_dbuser => 'clustercheckuser', + :galera_clustercheck_dbuser => 'clustercheck', :galera_clustercheck_dbpassword => 'clustercheckpassword!', :galera_clustercheck_ipaddress => '10.0.0.1' }