Skip to content

Commit 5589df7

Browse files
rickercclaytono
authored andcommitted
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)
1 parent 72184bf commit 5589df7

2 files changed

Lines changed: 6 additions & 6 deletions

File tree

manifests/db/mysql.pp

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -21,10 +21,10 @@
2121
# Optional. Defaults to undef.
2222
#
2323
# [*charset*]
24-
# the database charset. Optional. Defaults to 'latin1'
24+
# the database charset. Optional. Defaults to 'utf8'
2525
#
2626
# [*collate*]
27-
# the database collation. Optional. Defaults to 'latin1_swedish_ci'
27+
# the database collation. Optional. Defaults to 'utf8_unicode_ci'
2828
#
2929
# [*mysql_module*]
3030
# (optional) Mysql module version to use. Tested versions
@@ -37,8 +37,8 @@
3737
$user = 'ceilometer',
3838
$host = 'localhost',
3939
$allowed_hosts = undef,
40-
$charset = 'latin1',
41-
$collate = 'latin1_swedish_ci',
40+
$charset = 'utf8',
41+
$collate = 'utf8_unicode_ci',
4242
$mysql_module = '0.9',
4343
) {
4444

spec/classes/ceilometer_db_mysql_spec.rb

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -11,8 +11,8 @@
1111
:dbname => 'ceilometer',
1212
:user => 'ceilometer',
1313
:host => 'localhost',
14-
:charset => 'latin1',
15-
:collate => 'latin1_swedish_ci',
14+
:charset => 'utf8',
15+
:collate => 'utf8_unicode_ci',
1616
:mysql_module => '0.9',
1717
}
1818
end

0 commit comments

Comments
 (0)