openstack/puppet-glance
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: If85731786a061aed9cb44f016edc67f32c3db1a5
Closes-bug: #1446375
This commit is contained in:
Emilien Macchi 2015-04-21 13:08:15 -04:00
parent c0feafd0e9
commit 2f614cf9fd
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' # 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.
@ -40,7 +40,7 @@ class glance::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',
$cluster_id = 'localzone', $cluster_id = 'localzone',
$mysql_module = undef, $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( it { is_expected.to contain_openstacklib__db__mysql('glance').with(
:password_hash => '*41C910F70EB213CF4CB7B2F561B4995503C0A87B', :password_hash => '*41C910F70EB213CF4CB7B2F561B4995503C0A87B',
:charset => 'utf8' :charset => 'utf8',
:collate => 'utf8_general_ci',
)} )}
end end