openstack/puppet-manila
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: Ia62e6acb4eab5539a6525e89d0a82081c16613f4
Closes-bug: #1446375
This commit is contained in:
Emilien Macchi 2015-04-21 13:11:25 -04:00
parent 3d8d00d613
commit 6fa0931083
2 changed files with 6 additions and 5 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'
# #
# [*cluster_id*] # [*cluster_id*]
# (Optional) The cluster id. # (Optional) The cluster id.
@ -40,7 +40,7 @@ class manila::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/manila_db_mysql_spec.rb
View File

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