openstack/puppet-nova
Code Issues Proposed changes

Use puppet 4 compatible mysql functions

Browse Source 
These was introduced in 6.0.0 and is required to
support later version of puppetlabs-mysql.

Change-Id: Iddba31b559f6d30052b827967de33e0c9003b6b9
This commit is contained in:
Tobias Urdin
2019-02-08 12:21:52 +01:00
parent 9050944b4d
commit 23dc492a94
5 changed files with 12 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
manifests/db/mysql.pp
View File

@@ -51,7 +51,7 @@ class nova::db::mysql(
::openstacklib::db::mysql { 'nova': ::openstacklib::db::mysql { 'nova':
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,
@@ -63,7 +63,7 @@ class nova::db::mysql(
# need for cell_v2 # need for cell_v2
::openstacklib::db::mysql { 'nova_cell0': ::openstacklib::db::mysql { 'nova_cell0':
user => $user, user => $user,
password_hash => mysql_password($password), password_hash => mysql::password($password),
dbname => "${dbname}_cell0", dbname => "${dbname}_cell0",
host => $host, host => $host,
charset => $charset, charset => $charset,

2
manifests/db/mysql_api.pp
View File

@@ -45,7 +45,7 @@ class nova::db::mysql_api(
::openstacklib::db::mysql { 'nova_api': ::openstacklib::db::mysql { 'nova_api':
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/db/mysql_placement.pp
View File

@@ -45,7 +45,7 @@ class nova::db::mysql_placement(
::openstacklib::db::mysql { 'nova_placement': ::openstacklib::db::mysql { 'nova_placement':
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,

4
metadata.json
View File

@@ -33,6 +33,10 @@
"name": "puppetlabs/rabbitmq", "name": "puppetlabs/rabbitmq",
"version_requirement": ">=8.4.0 <9.0.0" "version_requirement": ">=8.4.0 <9.0.0"
}, },
{
"name": "puppetlabs/mysql",
"version_requirement": ">=6.0.0 <9.0.0"
},
{ {
"name": "puppetlabs/stdlib", "name": "puppetlabs/stdlib",
"version_requirement": ">=5.0.0 <6.0.0" "version_requirement": ">=5.0.0 <6.0.0"

4
releasenotes/notes/puppet4-mysql-func-cb910313316f65ed.yaml Normal file
View File

@@ -0,0 +1,4 @@
---
upgrade:
- |
This module now requires a puppetlabs-mysql version >= 6.0.0