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 166b00a)
redhat-openstack · May 28, 2014 · 5589df7 · 5589df7
1 parent 72184bf
commit 5589df7
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 6 deletions.
diff --git 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 @@
   $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
@@ -11,8 +11,8 @@
       :dbname       => 'ceilometer',
       :user         => 'ceilometer',
       :host         => 'localhost',
-      :charset      => 'latin1',
-      :collate      => 'latin1_swedish_ci',
+      :charset      => 'utf8',
+      :collate      => 'utf8_unicode_ci',
       :mysql_module => '0.9',
     }
   end