Ubuntu: Use utf8mb3 charset in MySQL
We are observing the failure in Ubuntu integration job caused by broken idempotency. It seems current mysql/mariadb in Ubuntu replaces utf8 with uft8mb3 automatically and this behavior results in unexpected change in second run. This change ensures that we use utf8mb3 in Ubuntu to avoid such mismatch caused by internal translation. Note this change is intended to be a quick gate fix and the charset would be updated to utf8mb4 later. Closes-Bug: #1929073 Change-Id: I7742120758057b5a00f1d093f355fda3791f4e02
This commit is contained in:
parent
dfcf3ca712
commit
085d356902
@ -51,6 +51,7 @@ class openstack_integration::aodh (
|
||||
notification_driver => 'messagingv2',
|
||||
}
|
||||
class { 'aodh::db::mysql':
|
||||
charset => $::openstack_integration::params::mysql_charset,
|
||||
password => 'aodh',
|
||||
}
|
||||
class { 'aodh::keystone::auth':
|
||||
|
@ -18,6 +18,7 @@ class openstack_integration::barbican {
|
||||
|
||||
include barbican
|
||||
class { 'barbican::db::mysql':
|
||||
charset => $::openstack_integration::params::mysql_charset,
|
||||
password => 'barbican',
|
||||
}
|
||||
class { 'barbican::db':
|
||||
|
@ -42,6 +42,7 @@ class openstack_integration::cinder (
|
||||
}
|
||||
include cinder::client
|
||||
class { 'cinder::db::mysql':
|
||||
charset => $::openstack_integration::params::mysql_charset,
|
||||
password => 'cinder',
|
||||
}
|
||||
class { 'cinder::keystone::auth':
|
||||
|
@ -13,6 +13,7 @@ class openstack_integration::designate {
|
||||
}
|
||||
|
||||
class { 'designate::db::mysql':
|
||||
charset => $::openstack_integration::params::mysql_charset,
|
||||
password => 'designate',
|
||||
}
|
||||
class { 'designate::logging':
|
||||
|
@ -12,6 +12,7 @@ class openstack_integration::ec2api {
|
||||
password => 'a_big_secret',
|
||||
}
|
||||
class { 'ec2api::db::mysql':
|
||||
charset => $::openstack_integration::params::mysql_charset,
|
||||
password => 'ec2api',
|
||||
}
|
||||
case $::osfamily {
|
||||
|
@ -28,6 +28,7 @@ class openstack_integration::glance (
|
||||
}
|
||||
|
||||
class { 'glance::db::mysql':
|
||||
charset => $::openstack_integration::params::mysql_charset,
|
||||
password => 'glance',
|
||||
}
|
||||
include glance
|
||||
|
@ -29,6 +29,7 @@ class openstack_integration::gnocchi (
|
||||
coordination_url => $::openstack_integration::config::tooz_url,
|
||||
}
|
||||
class { 'gnocchi::db::mysql':
|
||||
charset => $::openstack_integration::params::mysql_charset,
|
||||
password => 'gnocchi',
|
||||
}
|
||||
class { 'gnocchi::keystone::auth':
|
||||
|
@ -64,6 +64,7 @@ class openstack_integration::heat (
|
||||
notification_driver => 'messagingv2',
|
||||
}
|
||||
class { 'heat::db::mysql':
|
||||
charset => $::openstack_integration::params::mysql_charset,
|
||||
password => 'heat',
|
||||
}
|
||||
class { 'heat::keystone::auth':
|
||||
|
@ -33,6 +33,7 @@ class openstack_integration::ironic {
|
||||
amqp_sasl_mechanisms => 'PLAIN',
|
||||
}
|
||||
class { 'ironic::db::mysql':
|
||||
charset => $::openstack_integration::params::mysql_charset,
|
||||
password => 'ironic',
|
||||
}
|
||||
class { 'ironic::keystone::auth':
|
||||
@ -83,6 +84,7 @@ class openstack_integration::ironic {
|
||||
}
|
||||
'RedHat': {
|
||||
class { 'ironic::inspector::db::mysql':
|
||||
charset => $::openstack_integration::params::mysql_charset,
|
||||
password => 'a_big_secret',
|
||||
}
|
||||
class { 'ironic::inspector::authtoken':
|
||||
|
@ -52,6 +52,7 @@ class openstack_integration::keystone (
|
||||
minute => '*/30',
|
||||
}
|
||||
class { 'keystone::db::mysql':
|
||||
charset => $::openstack_integration::params::mysql_charset,
|
||||
password => 'keystone',
|
||||
}
|
||||
class { 'keystone::db':
|
||||
|
@ -57,6 +57,7 @@ class openstack_integration::magnum (
|
||||
}
|
||||
|
||||
class { 'magnum::db::mysql':
|
||||
charset => $::openstack_integration::params::mysql_charset,
|
||||
password => 'magnum',
|
||||
}
|
||||
|
||||
|
@ -42,6 +42,7 @@ class openstack_integration::mistral {
|
||||
password => 'a_big_secret',
|
||||
}
|
||||
class { 'mistral::db::mysql':
|
||||
charset => $::openstack_integration::params::mysql_charset,
|
||||
password => 'mistral',
|
||||
}
|
||||
class { 'mistral::api':
|
||||
|
@ -40,6 +40,7 @@ class openstack_integration::murano {
|
||||
}
|
||||
|
||||
class { 'murano::db::mysql':
|
||||
charset => $::openstack_integration::params::mysql_charset,
|
||||
password => 'a_big_secret',
|
||||
}
|
||||
class { 'murano::logging':
|
||||
|
@ -116,6 +116,7 @@ class openstack_integration::neutron (
|
||||
}
|
||||
|
||||
class { 'neutron::db::mysql':
|
||||
charset => $::openstack_integration::params::mysql_charset,
|
||||
password => 'neutron',
|
||||
}
|
||||
class { 'neutron::keystone::auth':
|
||||
|
@ -63,10 +63,12 @@ class openstack_integration::nova (
|
||||
}
|
||||
|
||||
class { 'nova::db::mysql':
|
||||
charset => $::openstack_integration::params::mysql_charset,
|
||||
password => 'nova',
|
||||
}
|
||||
class { 'nova::db::mysql_api':
|
||||
password => 'nova',
|
||||
charset => $::openstack_integration::params::mysql_charset,
|
||||
password => 'nova',
|
||||
}
|
||||
include nova::cell_v2::simple_setup
|
||||
|
||||
|
@ -5,11 +5,19 @@ class openstack_integration::params {
|
||||
$ca_bundle_cert_path = '/etc/ssl/certs/ca-bundle.crt'
|
||||
$cert_path = '/etc/pki/ca-trust/source/anchors/puppet_openstack.pem'
|
||||
$update_ca_certs_cmd = '/usr/bin/update-ca-trust force-enable && /usr/bin/update-ca-trust extract'
|
||||
$mysql_charset = 'utf8'
|
||||
}
|
||||
'Debian': {
|
||||
$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'
|
||||
} else {
|
||||
# TODO(tkajinam): This is to fix the gate quickly. We should revisit
|
||||
# this later. utf8mb4 would be the preferred option
|
||||
$mysql_charset = 'utf8mb3'
|
||||
}
|
||||
}
|
||||
default: {
|
||||
fail("Unsupported osfamily: ${::osfamily} operatingsystem")
|
||||
|
@ -16,6 +16,7 @@ class openstack_integration::placement {
|
||||
}
|
||||
|
||||
class { 'placement::db::mysql':
|
||||
charset => $::openstack_integration::params::mysql_charset,
|
||||
password => 'placement',
|
||||
}
|
||||
|
||||
|
@ -25,6 +25,7 @@ class openstack_integration::sahara (
|
||||
}
|
||||
|
||||
class { 'sahara::db::mysql':
|
||||
charset => $::openstack_integration::params::mysql_charset,
|
||||
password => 'sahara',
|
||||
}
|
||||
|
||||
|
@ -45,6 +45,7 @@ class openstack_integration::trove {
|
||||
nova_proxy_admin_pass => 'a_big_secret',
|
||||
}
|
||||
class { 'trove::db::mysql':
|
||||
charset => $::openstack_integration::params::mysql_charset,
|
||||
password => 'trove',
|
||||
}
|
||||
class { 'trove::keystone::auth':
|
||||
|
@ -17,6 +17,7 @@ class openstack_integration::vitrage {
|
||||
}
|
||||
|
||||
class { 'vitrage::db::mysql':
|
||||
charset => $::openstack_integration::params::mysql_charset,
|
||||
password => 'vitrage',
|
||||
}
|
||||
|
||||
|
@ -16,6 +16,7 @@ class openstack_integration::watcher {
|
||||
Exec['update-ca-certificates'] ~> Service['httpd']
|
||||
}
|
||||
class { 'watcher::db::mysql':
|
||||
charset => $::openstack_integration::params::mysql_charset,
|
||||
password => 'watcher',
|
||||
}
|
||||
class { 'watcher::db':
|
||||
|
@ -13,6 +13,7 @@ class openstack_integration::zaqar {
|
||||
debug => true,
|
||||
}
|
||||
class { 'zaqar::db::mysql':
|
||||
charset => $::openstack_integration::params::mysql_charset,
|
||||
password => 'zaqar',
|
||||
}
|
||||
class { 'zaqar::keystone::auth':
|
||||
|
Loading…
x
Reference in New Issue
Block a user