summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJeremy Stanley <fungi@yuggoth.org>2019-01-19 15:11:50 +0000
committerJeremy Stanley <fungi@yuggoth.org>2019-01-19 15:13:04 +0000
commitb46a3aadefb7764ef250297589b4dffe2d44b071 (patch)
treee467729e1df4a7b2bf83d06cf8765cab6dc7557d
parentc4c7e17f1933194784f7bbf3f07cc746e4b58d1d (diff)
Use a utf8mb4 collation
Change I25bd7b5d2a904dad3e13efaf2da94cce205bcc0b switched the characterset for new databases to utf8mb4, but the Puppet MySQL module independently defaults the collate parameter to utf_general_ci which is not compatible with utf8mb4. Set an explicit utf8mb4_general_ci collation instead so that the database can be created successfully. Change-Id: I9cc715e0b0cec9494489d56a2f4c1549782b0fca
Notes
Notes (review): Code-Review+2: Colleen Murphy <colleen@gazlene.net> Code-Review+2: Monty Taylor <mordred@inaugust.com> Workflow+1: Monty Taylor <mordred@inaugust.com> Verified+2: Zuul Submitted-by: Zuul Submitted-at: Sat, 19 Jan 2019 18:06:01 +0000 Reviewed-on: https://review.openstack.org/631924 Project: openstack-infra/puppet-storyboard 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 b05a7d9..4198789 100644
--- a/manifests/mysql.pp
+++ b/manifests/mysql.pp
@@ -33,5 +33,6 @@ class storyboard::mysql (
33 host => 'localhost', 33 host => 'localhost',
34 grant => ['all'], 34 grant => ['all'],
35 charset => 'utf8mb4', 35 charset => 'utf8mb4',
36 collate => 'utf8mb4_general_ci',
36 } 37 }
37} 38}