From 23dc492a940209ee17397fd9eee2445bb9a9d7eb Mon Sep 17 00:00:00 2001
From: Tobias Urdin <tobias.urdin@binero.se>
Date: Fri, 8 Feb 2019 12:21:52 +0100
Subject: [PATCH] Use puppet 4 compatible mysql functions

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

Change-Id: Iddba31b559f6d30052b827967de33e0c9003b6b9
---
 manifests/db/mysql.pp                                       | 4 ++--
 manifests/db/mysql_api.pp                                   | 2 +-
 manifests/db/mysql_placement.pp                             | 2 +-
 metadata.json                                               | 4 ++++
 releasenotes/notes/puppet4-mysql-func-cb910313316f65ed.yaml | 4 ++++
 5 files changed, 12 insertions(+), 4 deletions(-)
 create mode 100644 releasenotes/notes/puppet4-mysql-func-cb910313316f65ed.yaml

diff --git a/manifests/db/mysql.pp b/manifests/db/mysql.pp
index 509465d0f..397ea8e7c 100644
--- a/manifests/db/mysql.pp
+++ b/manifests/db/mysql.pp
@@ -51,7 +51,7 @@ class nova::db::mysql(
 
   ::openstacklib::db::mysql { 'nova':
     user          => $user,
-    password_hash => mysql_password($password),
+    password_hash => mysql::password($password),
     dbname        => $dbname,
     host          => $host,
     charset       => $charset,
@@ -63,7 +63,7 @@ class nova::db::mysql(
     # need for cell_v2
     ::openstacklib::db::mysql { 'nova_cell0':
       user          => $user,
-      password_hash => mysql_password($password),
+      password_hash => mysql::password($password),
       dbname        => "${dbname}_cell0",
       host          => $host,
       charset       => $charset,
diff --git a/manifests/db/mysql_api.pp b/manifests/db/mysql_api.pp
index f42bfbef0..cf0ed335c 100644
--- a/manifests/db/mysql_api.pp
+++ b/manifests/db/mysql_api.pp
@@ -45,7 +45,7 @@ class nova::db::mysql_api(
 
   ::openstacklib::db::mysql { 'nova_api':
     user          => $user,
-    password_hash => mysql_password($password),
+    password_hash => mysql::password($password),
     dbname        => $dbname,
     host          => $host,
     charset       => $charset,
diff --git a/manifests/db/mysql_placement.pp b/manifests/db/mysql_placement.pp
index 24817f0e1..1f3d5c557 100644
--- a/manifests/db/mysql_placement.pp
+++ b/manifests/db/mysql_placement.pp
@@ -45,7 +45,7 @@ class nova::db::mysql_placement(
 
   ::openstacklib::db::mysql { 'nova_placement':
     user          => $user,
-    password_hash => mysql_password($password),
+    password_hash => mysql::password($password),
     dbname        => $dbname,
     host          => $host,
     charset       => $charset,
diff --git a/metadata.json b/metadata.json
index c85d5ad69..ce8ad289d 100644
--- a/metadata.json
+++ b/metadata.json
@@ -33,6 +33,10 @@
             "name": "puppetlabs/rabbitmq",
             "version_requirement": ">=8.4.0 <9.0.0"
         },
+        {
+            "name": "puppetlabs/mysql",
+            "version_requirement": ">=6.0.0 <9.0.0"
+        },
         {
             "name": "puppetlabs/stdlib",
             "version_requirement": ">=5.0.0 <6.0.0"
diff --git a/releasenotes/notes/puppet4-mysql-func-cb910313316f65ed.yaml b/releasenotes/notes/puppet4-mysql-func-cb910313316f65ed.yaml
new file mode 100644
index 000000000..9db533ed9
--- /dev/null
+++ b/releasenotes/notes/puppet4-mysql-func-cb910313316f65ed.yaml
@@ -0,0 +1,4 @@
+---
+upgrade:
+  - |
+    This module now requires a puppetlabs-mysql version >= 6.0.0