Default to utf8 for MySQL

Change default charset to utf8 and default collation order to
utf8_unicode_ci to align with upstream defaults.

Change-Id: I0fb57f14a0d30226c840a6e920f2b3807b90080a
Closes-Bug: #1322715
(cherry picked from commit 166b00a773bb2830175bd61a451294d757453eb3)

diff --git a/manifests/db/mysql.pp b/manifests/db/mysql.pp
index 937d6417a652e4f5f6e17e72ca6d5254ad0bae9f..ca7548d008668ccc8cca0794c0db48abf77a340f 100644 (file)
--- a/manifests/db/mysql.pp
+++ b/manifests/db/mysql.pp
@@ -21,10 +21,10 @@
 #    Optional. Defaults to undef.
 #
 #  [*charset*]
-#    the database charset. Optional. Defaults to 'latin1'
+#    the database charset. Optional. Defaults to 'utf8'
 #
 #  [*collate*]
-#    the database collation. Optional. Defaults to 'latin1_swedish_ci'
+#    the database collation. Optional. Defaults to 'utf8_unicode_ci'
 #
 #  [*mysql_module*]
 #    (optional) Mysql module version to use. Tested versions
@@ -37,8 +37,8 @@ class ceilometer::db::mysql(
   $user          = 'ceilometer',
   $host          = 'localhost',
   $allowed_hosts = undef,
-  $charset       = 'latin1',
-  $collate       = 'latin1_swedish_ci',
+  $charset       = 'utf8',
+  $collate       = 'utf8_unicode_ci',
   $mysql_module  = '0.9',
 ) {
 

diff --git a/spec/classes/ceilometer_db_mysql_spec.rb b/spec/classes/ceilometer_db_mysql_spec.rb
index 94f383b72437a9df38f19e085db6910ad1f6620a..30d97c62b28a7af7e04b276fec0dd139d1bea138 100644 (file)
--- a/spec/classes/ceilometer_db_mysql_spec.rb
+++ b/spec/classes/ceilometer_db_mysql_spec.rb
@@ -11,8 +11,8 @@ describe 'ceilometer::db::mysql' do
       :dbname       => 'ceilometer',
       :user         => 'ceilometer',
       :host         => 'localhost',
-      :charset      => 'latin1',
-      :collate      => 'latin1_swedish_ci',
+      :charset      => 'utf8',
+      :collate      => 'utf8_unicode_ci',
       :mysql_module => '0.9',
     }
   end