From bc197410acc13d8d85ebeca97c925068739ae622 Mon Sep 17 00:00:00 2001
From: Emilien Macchi <emilien@redhat.com>
Date: Tue, 21 Apr 2015 13:14:41 -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: Iafdb875ce636aefd81e07861230e3a60b3cd22c7
Closes-bug: #1446375
---
 manifests/db/mysql.pp               | 4 ++--
 spec/classes/trove_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 a20bc5ec..6748de82 100644
--- a/manifests/db/mysql.pp
+++ b/manifests/db/mysql.pp
@@ -47,7 +47,7 @@
 #
 # [*collate*]
 #   (optional) Charset collate of trove database
-#   Defaults 'utf8_unicode_ci'.
+#   Defaults 'utf8_general_ci'.
 #
 # [*mysql_module*]
 #   (optional) Deprecated. Does nothing
@@ -59,7 +59,7 @@ class trove::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/trove_db_mysql_spec.rb b/spec/classes/trove_db_mysql_spec.rb
index b42de635..c55b1a9e 100644
--- a/spec/classes/trove_db_mysql_spec.rb
+++ b/spec/classes/trove_db_mysql_spec.rb
@@ -31,7 +31,7 @@ describe 'trove::db::mysql' do
       :password      => 's3cr3t',
       :user          => 'trove',
       :charset       => 'utf8',
-      :collate       => 'utf8_unicode_ci',
+      :collate       => 'utf8_general_ci',
       :host          => '127.0.0.1',
     }
   end