From 697cbb83dbd538c7f51638f50531dac6a4b518c0 Mon Sep 17 00:00:00 2001
From: Takashi Kajinami <tkajinam@redhat.com>
Date: Fri, 24 Jun 2022 10:23:11 +0900
Subject: [PATCH] Ubuntu: Use utf8mb3 charset in MySQL

... to fix the broken idempotency in litmus job. Current mysql/mariadb
in Ubuntu replaces utf8 with uft8mb3 automatically and this behavior
results in unexpected change in second run.

Related-Bug: #1929073
Change-Id: Ide1f9484d0f9aaf719ccfbe3ab5282ecd901ae6b
---
 spec/acceptance/mysql_spec.rb | 8 +++++++-
 1 file changed, 7 insertions(+), 1 deletion(-)

diff --git a/spec/acceptance/mysql_spec.rb b/spec/acceptance/mysql_spec.rb
index dcc8fbd8..21147768 100644
--- a/spec/acceptance/mysql_spec.rb
+++ b/spec/acceptance/mysql_spec.rb
@@ -10,7 +10,13 @@ describe 'openstacklib mysql' do
 
       class { 'mysql::server': }
 
-      ::openstacklib::db::mysql { 'ci':
+      $charset = $::operatingsystem ? {
+        'Ubuntu' => 'utf8mb3',
+        default  => 'utf8',
+      }
+
+      openstacklib::db::mysql { 'ci':
+        charset       => $charset,
         password_hash => mysql::password('keystone'),
         allowed_hosts => '127.0.0.1',
       }