openstack
/
puppet-ceilometer
Code Issues Proposed changes

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: I9fb58a749436873b60b51bb67127ae9524f944db
Closes-bug: #1446375
This commit is contained in:
Emilien Macchi 2015-04-21 13:05:47 -04:00
parent e87b29e6ef
commit 441fe25bfe
2 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
manifests/db/mysql.pp
View File

@ -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.
@ -36,7 +36,7 @@ class ceilometer::db::mysql(
$host = '127.0.0.1',
$allowed_hosts = undef,
$charset = 'utf8',
$collate = 'utf8_unicode_ci',
$collate = 'utf8_general_ci',
$mysql_module = undef,
) {

2
spec/classes/ceilometer_db_mysql_spec.rb
View File

@ -12,7 +12,7 @@ describe 'ceilometer::db::mysql' do
:user => 'ceilometer',
:host => 'localhost',
:charset => 'utf8',
:collate => 'utf8_unicode_ci',
:collate => 'utf8_general_ci',
}
end