openstack/puppet-glance
Code Issues Proposed changes

Merge "MySQL: change default MySQL collate to utf8_general_ci"

Browse Source
This commit is contained in:
Jenkins 2015-04-22 04:00:30 +00:00 committed by Gerrit Code Review
commit a758389de6
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

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

3
spec/classes/glance_db_mysql_spec.rb
View File

@ -20,7 +20,8 @@ describe 'glance::db::mysql' do
it { is_expected.to contain_openstacklib__db__mysql('glance').with(
:password_hash => '*41C910F70EB213CF4CB7B2F561B4995503C0A87B',
:charset => 'utf8'
:charset => 'utf8',
:collate => 'utf8_general_ci',
)}
end