From 64d8cfb8c1637871bba8c692d0c8184b75aceba2 Mon Sep 17 00:00:00 2001
From: Emilien Macchi <emilien@redhat.com>
Date: Tue, 21 Apr 2015 13:05:47 -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: I9fb58a749436873b60b51bb67127ae9524f944db
Closes-bug: #1446375
(cherry picked from commit 441fe25bfe6b3992436fef9f5691fecce08a51e1)
---
 manifests/db/mysql.pp                    | 4 ++--
 spec/classes/ceilometer_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 6fd47c4..020f9f2 100644
--- 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 5d32aba..0acaa9e 100644
--- 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
 
-- 
2.45.2