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: I9fb58a749436873b60b51bb67127ae9524f944db
Closes-bug: #1446375
(cherry picked from commit 441fe25bfe6b3992436fef9f5691fecce08a51e1)

diff --git a/manifests/db/mysql.pp b/manifests/db/mysql.pp
index 6fd47c45ce6f45d7a7072c14da1a9504a7902237..020f9f2fcdb615f5f8ef917ab306686e67303e67 100644 (file)
--- a/manifests/db/mysql.pp
+++ b/manifests/db/mysql.pp
@@ -24,7 +24,7 @@
 #    the database charset. Optional. Defaults to 'utf8'
 #
 #  [*collate*]
-#    the database collation. Optional. Defaults to 'utf8_unicode_ci'
+#    the database collation. Optional. Defaults to 'utf8_general_ci'
 #
 #  [*mysql_module*]
 #    (optional) Deprecated. Does nothing.
@@ -36,7 +36,7 @@ class ceilometer::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/ceilometer_db_mysql_spec.rb b/spec/classes/ceilometer_db_mysql_spec.rb
index 5d32abad66ef511f8e7ad23429cb94576c39be61..0acaa9e55de1aa1fee0f25b3e3e9ef298346ec3b 100644 (file)
--- a/spec/classes/ceilometer_db_mysql_spec.rb
+++ b/spec/classes/ceilometer_db_mysql_spec.rb
@@ -12,7 +12,7 @@ describe 'ceilometer::db::mysql' do
       :user         => 'ceilometer',
       :host         => 'localhost',
       :charset      => 'utf8',
-      :collate      => 'utf8_unicode_ci',
+      :collate      => 'utf8_general_ci',
     }
   end