diff --git a/README.md b/README.md index 4329cd24..8ea83e26 100644 --- a/README.md +++ b/README.md @@ -110,7 +110,7 @@ string; optional; default to 'utf8' #####`collate` The collate to use for the database; -string; optional; default to 'utf8_unicode_ci' +string; optional; default to 'utf8_general_ci' #####`allowed_hosts` Additional hosts that are allowed to access this database; diff --git a/manifests/db/mysql.pp b/manifests/db/mysql.pp index 2f01625c..7cf10102 100644 --- a/manifests/db/mysql.pp +++ b/manifests/db/mysql.pp @@ -26,7 +26,7 @@ # # [*collate*] # The collate to use for the database; -# string; optional; default to 'utf8_unicode_ci' +# string; optional; default to 'utf8_general_ci' # # [*allowed_hosts*] # Additional hosts that are allowed to access this database; @@ -42,7 +42,7 @@ define openstacklib::db::mysql ( $user = $title, $host = '127.0.0.1', $charset = 'utf8', - $collate = 'utf8_unicode_ci', + $collate = 'utf8_general_ci', $allowed_hosts = [], $privileges = 'ALL', ) { diff --git a/spec/defines/openstacklib_db_mysql_spec.rb b/spec/defines/openstacklib_db_mysql_spec.rb index 1656e86c..ca6884a3 100644 --- a/spec/defines/openstacklib_db_mysql_spec.rb +++ b/spec/defines/openstacklib_db_mysql_spec.rb @@ -21,7 +21,7 @@ describe 'openstacklib::db::mysql' do it { is_expected.to contain_mysql_database(title).with( :charset => 'utf8', - :collate => 'utf8_unicode_ci' + :collate => 'utf8_general_ci' )} it { is_expected.to contain_openstacklib__db__mysql__host_access("#{title}_127.0.0.1").with( :user => title, @@ -37,7 +37,7 @@ describe 'openstacklib::db::mysql' do it { is_expected.to contain_mysql_database(params[:dbname]).with( :charset => 'utf8', - :collate => 'utf8_unicode_ci' + :collate => 'utf8_general_ci' )} it { is_expected.to contain_openstacklib__db__mysql__host_access("#{params[:dbname]}_127.0.0.1").with( :user => title, @@ -53,12 +53,12 @@ describe 'openstacklib::db::mysql' do it { is_expected.to contain_mysql_database(title).with( :charset => 'utf8', - :collate => 'utf8_unicode_ci' + :collate => 'utf8_general_ci' )} it { is_expected.to contain_openstacklib__db__mysql__host_access("#{title}_127.0.0.1").with( :user => params[:user], :database => title, - :privileges => 'ALL' + :privileges => 'ALL', )} end