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: I8037d3c1971e4b9bc965a9fd0884e1839585d071
Closes-bug: #1446375

manifests/db/mysql.pp

@@ -32,7 +32,7 @@
 # [*collate*]
 #   (Optional) The database collate.
 #   Only used with mysql modules >= 2.2.
-#   Defaults to 'utf8_unicode_ci'
+#   Defaults to 'utf8_general_ci'
 #
 # === Deprecated Parameters
 #
@@ -46,7 +46,7 @@ class heat::db::mysql(
   $host          = '127.0.0.1',
   $allowed_hosts = undef,
   $charset       = 'utf8',
-  $collate       = 'utf8_unicode_ci',
+  $collate       = 'utf8_general_ci',
   $mysql_module  = undef
 ) {
 

spec/classes/heat_db_mysql_spec.rb

@@ -11,6 +11,7 @@ describe 'heat::db::mysql' do
       :user         => 'heat',
       :host         => 'localhost',
       :charset      => 'utf8',
+      :collate      => 'utf8_general_ci',
     }
   end
 
@@ -27,6 +28,7 @@ describe 'heat::db::mysql' do
         :password_hash => '*58C036CDA51D8E8BBBBF2F9EA5ABF111ADA444F0',
         :host          => params[:host],
         :charset       => params[:charset],
+        :collate       => 'utf8_general_ci',
         :require       => 'Class[Mysql::Config]'
       )
     end