openstack/puppet-trove
Code Issues Proposed changes

MySQL: change default MySQL collate to utf8_general_ci

Browse Source 
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: Iafdb875ce636aefd81e07861230e3a60b3cd22c7
Closes-bug: #1446375
This commit is contained in:
Emilien Macchi 2015-04-21 13:14:41 -04:00
parent 70325fb0fc
commit bc197410ac
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

@ -47,7 +47,7 @@
# #
# [*collate*] # [*collate*]
# (optional) Charset collate of trove database # (optional) Charset collate of trove database
# Defaults 'utf8_unicode_ci'. # Defaults 'utf8_general_ci'.
# #
# [*mysql_module*] # [*mysql_module*]
# (optional) Deprecated. Does nothing # (optional) Deprecated. Does nothing
@ -59,7 +59,7 @@ class trove::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,
) { ) {

2
spec/classes/trove_db_mysql_spec.rb
View File

@ -31,7 +31,7 @@ describe 'trove::db::mysql' do
:password => 's3cr3t', :password => 's3cr3t',
:user => 'trove', :user => 'trove',
:charset => 'utf8', :charset => 'utf8',
:collate => 'utf8_unicode_ci', :collate => 'utf8_general_ci',
:host => '127.0.0.1', :host => '127.0.0.1',
} }
end end