openstack/puppet-openstack-integration
Code Issues Proposed changes

Ubuntu: Use utf8 charset

Browse Source 
puppetlabs-apache installs mariadb instead of mysql since 13.0.0.

mariadb translates utf8mb3 to utf8 contrary to the behavior of mysql
which translates utf8 to utf8mb3, and this breaks idempotency when
utf8mb3 is used.

This reverts the past changes to replace utf8 by utf8mb3 to fix
idempotency.

Change-Id: I7edcc6eee5b473076f0cd42efde97232289aaa01
This commit is contained in:
Takashi Kajinami 2022-08-28 22:41:05 +09:00
parent bce11235a2
commit ce702ebfb0
1 changed files with 2 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
manifests/params.pp
View File

@ -12,15 +12,8 @@ class openstack_integration::params {
$ca_bundle_cert_path = '/etc/ssl/certs/puppet_openstack.pem'
$cert_path = '/usr/local/share/ca-certificates/puppet_openstack.crt'
$update_ca_certs_cmd = '/usr/sbin/update-ca-certificates -f'
if $::operatingsystem == 'Debian' {
$mysql_charset = 'utf8'
$mysql_collate = 'utf8_general_ci'
} else {
# TODO(tkajinam): This is to fix the gate quickly. We should revisit
# this later. utf8mb4 would be the preferred option
$mysql_charset = 'utf8mb3'
$mysql_collate = 'utf8mb3_general_ci'
}
$mysql_charset = 'utf8'
$mysql_collate = 'utf8_general_ci'
}
default: {
fail("Unsupported osfamily: ${::osfamily} operatingsystem")