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:
parent
e87b29e6ef
commit
441fe25bfe
|
@ -24,7 +24,7 @@
|
||||||
# the database charset. Optional. Defaults to 'utf8'
|
# the database charset. Optional. Defaults to 'utf8'
|
||||||
#
|
#
|
||||||
# [*collate*]
|
# [*collate*]
|
||||||
# the database collation. Optional. Defaults to 'utf8_unicode_ci'
|
# the database collation. Optional. Defaults to 'utf8_general_ci'
|
||||||
#
|
#
|
||||||
# [*mysql_module*]
|
# [*mysql_module*]
|
||||||
# (optional) Deprecated. Does nothing.
|
# (optional) Deprecated. Does nothing.
|
||||||
|
@ -36,7 +36,7 @@ class ceilometer::db::mysql(
|
||||||
$host = '127.0.0.1',
|
$host = '127.0.0.1',
|
||||||
$allowed_hosts = undef,
|
$allowed_hosts = undef,
|
||||||
$charset = 'utf8',
|
$charset = 'utf8',
|
||||||
$collate = 'utf8_unicode_ci',
|
$collate = 'utf8_general_ci',
|
||||||
$mysql_module = undef,
|
$mysql_module = undef,
|
||||||
) {
|
) {
|
||||||
|
|
||||||
|
|
|
@ -12,7 +12,7 @@ describe 'ceilometer::db::mysql' do
|
||||||
:user => 'ceilometer',
|
:user => 'ceilometer',
|
||||||
:host => 'localhost',
|
:host => 'localhost',
|
||||||
:charset => 'utf8',
|
:charset => 'utf8',
|
||||||
:collate => 'utf8_unicode_ci',
|
:collate => 'utf8_general_ci',
|
||||||
}
|
}
|
||||||
end
|
end
|
||||||
|
|
||||||
|
|
Loading…
Reference in New Issue