From e63fec36d312fe85f846172ab4d30cbd5f465e5a Mon Sep 17 00:00:00 2001
From: Tobias Urdin <tobias.urdin@binero.se>
Date: Fri, 8 Feb 2019 12:03:55 +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: Ib0af84954cd7fc34b83e72915972f107d731957a
---
 manifests/db/mysql.pp                                       | 2 +-
 manifests/db/powerdns/mysql.pp                              | 2 +-
 metadata.json                                               | 4 ++++
 releasenotes/notes/puppet4-mysql-func-2c9ccc1e98ad0af3.yaml | 4 ++++
 4 files changed, 10 insertions(+), 2 deletions(-)
 create mode 100644 releasenotes/notes/puppet4-mysql-func-2c9ccc1e98ad0af3.yaml

diff --git a/manifests/db/mysql.pp b/manifests/db/mysql.pp
index 16f50518..02567a39 100644
--- a/manifests/db/mysql.pp
+++ b/manifests/db/mysql.pp
@@ -45,7 +45,7 @@ class designate::db::mysql(
 
   ::openstacklib::db::mysql { 'designate':
     user          => $user,
-    password_hash => mysql_password($password),
+    password_hash => mysql::password($password),
     dbname        => $dbname,
     host          => $host,
     charset       => $charset,
diff --git a/manifests/db/powerdns/mysql.pp b/manifests/db/powerdns/mysql.pp
index a9dfdfa6..2bb40b37 100644
--- a/manifests/db/powerdns/mysql.pp
+++ b/manifests/db/powerdns/mysql.pp
@@ -45,7 +45,7 @@ class designate::db::powerdns::mysql (
 
   ::openstacklib::db::mysql { 'powerdns':
     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 a6ca4baa..3cd763f0 100644
--- a/metadata.json
+++ b/metadata.json
@@ -13,6 +13,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-2c9ccc1e98ad0af3.yaml b/releasenotes/notes/puppet4-mysql-func-2c9ccc1e98ad0af3.yaml
new file mode 100644
index 00000000..9db533ed
--- /dev/null
+++ b/releasenotes/notes/puppet4-mysql-func-2c9ccc1e98ad0af3.yaml
@@ -0,0 +1,4 @@
+---
+upgrade:
+  - |
+    This module now requires a puppetlabs-mysql version >= 6.0.0