Explicitely disable ssl in mariadb server config
After mariadb 10.5.18, mariadb fails to start if ssl cert parameters are configured in the file but the certificates do not exist [1]. This problem was fixed in puppetlabs-mysql 13.1.0[2] but we use older versions (13.0.0 in stable/zed for example) in stable branch jobs. CentOS Stream 9 has just bumped to mariadb-10.5.22 and this is breaking all non-ssl jobs. I'm also fixing u-c url to use the proper version for Xena and pinning Ruby gems versions required for CentOS Stream 8. [1] https://mariadb.com/kb/en/mariadb-10-5-18-release-notes/#ssl [2] https://github.com/puppetlabs/puppetlabs-mysql/issues/1509 Change-Id: I317c5b1fa8967dc40437fa6e3258b7d8f2c79e58
This commit is contained in:
parent
b13d33ecb8
commit
9d4e9574b6
@ -110,7 +110,7 @@ mod 'concat',
|
||||
|
||||
mod 'firewall',
|
||||
:git => 'https://github.com/puppetlabs/puppetlabs-firewall',
|
||||
:ref => 'main'
|
||||
:ref => '760196f4d46bc74837b95c452ca1c67c6305b9f5'
|
||||
|
||||
mod 'inifile',
|
||||
:git => 'https://github.com/puppetlabs/puppetlabs-inifile',
|
||||
|
@ -39,6 +39,7 @@ class packstack::mariadb ()
|
||||
'wsrep_cluster_name' => 'galera_cluster',
|
||||
'wsrep_sst_method' => 'rsync',
|
||||
'wsrep_sst_auth' => "root:${mysql_root_password}",
|
||||
'ssl-disable' => true,
|
||||
},
|
||||
},
|
||||
}
|
||||
|
14
run_tests.sh
14
run_tests.sh
@ -17,7 +17,7 @@ export PATH=$PATH:/usr/local/sbin:/usr/sbin
|
||||
|
||||
SCENARIO=${SCENARIO:-scenario001}
|
||||
|
||||
BRANCH=master
|
||||
BRANCH=stable/xena
|
||||
|
||||
# Find OS version and release
|
||||
source /etc/os-release
|
||||
@ -278,8 +278,16 @@ if [ "${INSTALL_FROM_SOURCE}" = true ]; then
|
||||
if ([ "$OS_NAME" = "RedHat" ] || [ "$OS_NAME" = "CentOS" ]) && [ $OS_VERSION -gt 8 ]; then
|
||||
$SUDO gem install r10k
|
||||
else
|
||||
$SUDO gem install gettext -v 3.2.9 --no-ri --no-rdoc
|
||||
$SUDO gem install r10k -v 2.6.4 --no-ri --no-rdoc
|
||||
|
||||
cat <<EOF >/tmp/Gemfile
|
||||
source 'http://rubygems.org'
|
||||
gem 'fast_gettext', '<1.2.0'
|
||||
gem 'gettext', '< 3.3.0'
|
||||
gem 'multipart-post', '<2.2.0'
|
||||
gem 'semantic_puppet', '<1.1.0'
|
||||
gem 'r10k', '= 2.6.4'
|
||||
EOF
|
||||
$SUDO gem install -g /tmp/Gemfile
|
||||
fi
|
||||
# make sure there is no puppet module pre-installed
|
||||
$SUDO rm -rf "${PUPPETFILE_DIR:?}/"*
|
||||
|
2
tox.ini
2
tox.ini
@ -10,7 +10,7 @@ setenv = VIRTUAL_ENV={envdir}
|
||||
LANGUAGE=en_US:en
|
||||
LC_ALL=C
|
||||
deps =
|
||||
-c{env:UPPER_CONSTRAINTS_FILE:https://releases.openstack.org/constraints/upper/master}
|
||||
-c{env:UPPER_CONSTRAINTS_FILE:https://releases.openstack.org/constraints/upper/xena}
|
||||
-r{toxinidir}/test-requirements.txt
|
||||
-r{toxinidir}/requirements.txt
|
||||
|
||||
|
Loading…
Reference in New Issue
Block a user