From 2f614cf9fd15a5348ac11eb617e63883598f0497 Mon Sep 17 00:00:00 2001
From: Emilien Macchi <emilien@redhat.com>
Date: Tue, 21 Apr 2015 13:08:15 -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: If85731786a061aed9cb44f016edc67f32c3db1a5
Closes-bug: #1446375
---
 manifests/db/mysql.pp                | 4 ++--
 spec/classes/glance_db_mysql_spec.rb | 3 ++-
 2 files changed, 4 insertions(+), 3 deletions(-)

diff --git a/manifests/db/mysql.pp b/manifests/db/mysql.pp
index 4f31b3b2..f0b2090a 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.
@@ -40,7 +40,7 @@ class glance::db::mysql(
   $host          = '127.0.0.1',
   $allowed_hosts = undef,
   $charset       = 'utf8',
-  $collate       = 'utf8_unicode_ci',
+  $collate       = 'utf8_general_ci',
   $cluster_id    = 'localzone',
   $mysql_module  = undef,
 ) {
diff --git a/spec/classes/glance_db_mysql_spec.rb b/spec/classes/glance_db_mysql_spec.rb
index 7db098b1..d2da9e33 100644
--- a/spec/classes/glance_db_mysql_spec.rb
+++ b/spec/classes/glance_db_mysql_spec.rb
@@ -20,7 +20,8 @@ describe 'glance::db::mysql' do
 
     it { is_expected.to contain_openstacklib__db__mysql('glance').with(
       :password_hash => '*41C910F70EB213CF4CB7B2F561B4995503C0A87B',
-      :charset       => 'utf8'
+      :charset       => 'utf8',
+      :collate       => 'utf8_general_ci',
     )}
 
   end