From c29c2610a3e4fb3b7078e7c4aeb618812fab1cab Mon Sep 17 00:00:00 2001 From: Emilien Macchi Date: Tue, 21 Apr 2015 13:14:58 -0400 Subject: [PATCH] MySQL: change default MySQL collate to utf8_general_ci Install & configure MySQL database by using utf8_general_ci collation which is the way documented in OpenStack [1] and already the default in puppetlabs-mysql [2]. [1] http://goo.gl/GA5gyZ [2] https://github.com/puppetlabs/puppetlabs-mysql/blob/master/manifests/db.pp#L7 Change-Id: I1116cb941e9e432edb6228950c2b0cb4b2790802 Closes-bug: #1446375 --- manifests/db/mysql.pp | 4 ++-- spec/classes/tuskar_db_mysql_spec.rb | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/manifests/db/mysql.pp b/manifests/db/mysql.pp index a130192..f13530a 100644 --- a/manifests/db/mysql.pp +++ b/manifests/db/mysql.pp @@ -47,7 +47,7 @@ # # [*collate*] # (optional) Charset collate of tuskar database -# Defaults 'utf8_unicode_ci'. +# Defaults 'utf8_general_ci'. # # [*mysql_module*] # (optional) Deprecated. Does nothing @@ -59,7 +59,7 @@ class tuskar::db::mysql( $host = '127.0.0.1', $allowed_hosts = undef, $charset = 'utf8', - $collate = 'utf8_unicode_ci', + $collate = 'utf8_general_ci', $mysql_module = undef, ) { diff --git a/spec/classes/tuskar_db_mysql_spec.rb b/spec/classes/tuskar_db_mysql_spec.rb index c43c4e9..b9600ae 100644 --- a/spec/classes/tuskar_db_mysql_spec.rb +++ b/spec/classes/tuskar_db_mysql_spec.rb @@ -17,7 +17,7 @@ describe 'tuskar::db::mysql' do :password => 's3cr3t', :user => 'tuskar', :charset => 'utf8', - :collate => 'utf8_unicode_ci', + :collate => 'utf8_general_ci', :host => '127.0.0.1', } end