openstack
/
puppet-cinder
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: I41970c3256ae908351c48d911776e2e9f5940626
Closes-bug: #1446375
This commit is contained in:
Emilien Macchi 2015-04-21 13:07:05 -04:00
parent f083cb4f34
commit 08be3c0df1
2 changed files with 4 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

@ -26,7 +26,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'
#
# [*cluster_id*]
# (Optional) TODO
@ -44,7 +44,7 @@ class cinder::db::mysql (
$host = '127.0.0.1',
$allowed_hosts = undef,
$charset = 'utf8',
$collate = 'utf8_unicode_ci',
$collate = 'utf8_general_ci',
$cluster_id = 'localzone',
# DEPRECATED
$mysql_module = undef,

3
spec/classes/cinder_db_mysql_spec.rb
View File

@ -23,7 +23,8 @@ describe 'cinder::db::mysql' do
:user => 'cinder',
:password_hash => '*D821809F681A40A6E379B50D0463EFAE20BDD122',
:host => '127.0.0.1',
:charset => 'utf8'
:charset => 'utf8',
:collate => 'utf8_general_ci',
) }
end
describe "overriding allowed_hosts param to array" do