openstack/puppet-ironic
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 14:46:45 +00:00 committed by Gerrit Code Review
commit 96d1a1c0f0
2 changed files with 6 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
manifests/db/mysql.pp
View File

@ -38,7 +38,7 @@
#
# [*collate*]
# (optional) The collate to use for the nova database
# Defaults to 'utf8_unicode_ci'
# Defaults to 'utf8_general_ci'
#
# [*allowed_hosts*]
# (optional) Additional hosts that are allowed to access this DB
@ -54,7 +54,7 @@ class ironic::db::mysql (
$host = '127.0.0.1',
$allowed_hosts = undef,
$charset = 'utf8',
$collate = 'utf8_unicode_ci',
$collate = 'utf8_general_ci',
$cluster_id = undef,
) {

6
spec/classes/ironic_db_mysql_spec.rb
View File

@ -42,7 +42,8 @@ describe 'ironic::db::mysql' do
it { is_expected.to contain_openstacklib__db__mysql('ironic').with(
:user => 'ironic',
:password_hash => '*74B1C21ACE0C2D6B0678A5E503D2A60E8F9651A3',
:charset => 'utf8'
:charset => 'utf8',
:collate => 'utf8_general_ci',
)}
end
@ -54,7 +55,8 @@ describe 'ironic::db::mysql' do
it { is_expected.to contain_openstacklib__db__mysql('ironic').with(
:user => 'ironic',
:password_hash => '*74B1C21ACE0C2D6B0678A5E503D2A60E8F9651A3',
:charset => 'utf8'
:charset => 'utf8',
:collate => 'utf8_general_ci',
)}
end