summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorClark Boylan <clark.boylan@gmail.com>2016-11-14 17:48:10 -0800
committerClark Boylan <clark.boylan@gmail.com>2016-11-14 17:48:59 -0800
commitd157f7c1a8a390ac22db43578184c6124541ea07 (patch)
tree9700307c83e58e3007ad23a6b93de38930e3d4a5
parent1348e723d218c40d7c4bac5a53b23ddd2a8d1234 (diff)
Fix utf8 4 byte collation method
The default collate method used by the mysql puppet module is not compatbile with our 4 byte encoding. Update the collate method to match the 4 byte encoding. Change-Id: I8f65316ba609ecf30c9797d631bdeb4a083b16ce
Notes
Notes (review): Code-Review+2: Jeremy Stanley <fungi@yuggoth.org> Workflow+1: Jeremy Stanley <fungi@yuggoth.org> Verified+2: Jenkins Submitted-by: Jenkins Submitted-at: Thu, 05 Jan 2017 22:14:36 +0000 Reviewed-on: https://review.openstack.org/397476 Project: openstack-infra/puppet-ethercalc Branch: refs/heads/master
-rw-r--r--manifests/mysql.pp1
1 files changed, 1 insertions, 0 deletions
diff --git a/manifests/mysql.pp b/manifests/mysql.pp
index 2543817..7f30dfd 100644
--- a/manifests/mysql.pp
+++ b/manifests/mysql.pp
@@ -23,6 +23,7 @@ class etherpad_lite::mysql(
23 host => 'localhost', 23 host => 'localhost',
24 grant => ['all'], 24 grant => ['all'],
25 charset => 'utf8mb4', 25 charset => 'utf8mb4',
26 collate => 'utf8mb4_unicode_ci',
26 require => [ 27 require => [
27 Class['mysql::server'], 28 Class['mysql::server'],
28 Class['mysql::server::account_security'], 29 Class['mysql::server::account_security'],