openstack
/
puppet-tripleo
Code Issues Proposed changes

Stop using deprecated function mysql_password 

Function mysql_password is deprecated and has been removed
in recent puppetlabs-mysql [1]. It has been replaced with
the equivalent, namespaced function mysql::password. Use it
instead.

[1] 5a70627674

Change-Id: I405a986f78f865d89b54dffea17e84d75c068ed7
Closes-Bug: #1878153
This commit is contained in:
Damien Ciabrini 2020-05-12 09:32:49 +02:00
parent ea6e31cf87
commit b382becab1
4 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
manifests/profile/base/database/mysql.pp
View File

@ -218,7 +218,7 @@ class tripleo::profile::base::database::mysql (
# as well by creating a resource appropriately. # as well by creating a resource appropriately.
mysql_user { 'root@%': mysql_user { 'root@%':
ensure => present, ensure => present,
password_hash => mysql_password(hiera('mysql::server::root_password')), password_hash => mysql::password(hiera('mysql::server::root_password')),
} }
} }
if ($mysql_auth_ed25519) { if ($mysql_auth_ed25519) {

2
manifests/profile/base/database/mysql/user.pp
View File

@ -52,7 +52,7 @@ define tripleo::profile::base::database::mysql::user (
::openstacklib::db::mysql { $title : ::openstacklib::db::mysql { $title :
user => $user, user => $user,
password_hash => mysql_password($password), password_hash => mysql::password($password),
dbname => $dbname, dbname => $dbname,
host => $host, host => $host,
charset => $charset, charset => $charset,

2
manifests/profile/pacemaker/database/mysql.pp
View File

@ -280,7 +280,7 @@ class tripleo::profile::pacemaker::database::mysql (
# the other members. We also make sure that the permissions are the minimum necessary # the other members. We also make sure that the permissions are the minimum necessary
mysql_user { 'clustercheck@localhost': mysql_user { 'clustercheck@localhost':
ensure => 'present', ensure => 'present',
password_hash => mysql_password(hiera('mysql_clustercheck_password')), password_hash => mysql::password(hiera('mysql_clustercheck_password')),
require => Exec['galera-ready'], require => Exec['galera-ready'],
} }
mysql_grant { 'clustercheck@localhost/*.*': mysql_grant { 'clustercheck@localhost/*.*':

6
manifests/profile/pacemaker/database/mysql_bundle.pp
View File

@ -510,14 +510,14 @@ MYSQL_HOST=localhost\n",
# .my.cnf is re-generated by puppet # .my.cnf is re-generated by puppet
mysql_user { 'root@localhost': mysql_user { 'root@localhost':
ensure => present, ensure => present,
password_hash => mysql_password($mysql_root_password), password_hash => mysql::password($mysql_root_password),
} }
Mysql_user['root@localhost'] -> File['/root/.my.cnf'] Mysql_user['root@localhost'] -> File['/root/.my.cnf']
# make sure to update all root users in the mysql DB # make sure to update all root users in the mysql DB
mysql_user { 'root@%': mysql_user { 'root@%':
ensure => present, ensure => present,
password_hash => mysql_password($mysql_root_password), password_hash => mysql::password($mysql_root_password),
} }
# declare the clustercheck user resource to configure # declare the clustercheck user resource to configure
@ -529,7 +529,7 @@ MYSQL_HOST=localhost\n",
} }
} else { } else {
$clustercheck_resource_config = { $clustercheck_resource_config = {
password_hash => mysql_password($clustercheck_password), password_hash => mysql::password($clustercheck_password),
} }
} }
mysql_user { 'clustercheck@localhost': mysql_user { 'clustercheck@localhost':