From ae209826e363785acea5208fd30d064b5b313206 Mon Sep 17 00:00:00 2001
From: Tobias Urdin <tobias.urdin@binero.se>
Date: Fri, 8 Feb 2019 12:20:48 +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: I9f359a1110d175e232adc14671e448dd7a334eb9
---
 manifests/db/mysql.pp                                       | 2 +-
 metadata.json                                               | 4 ++++
 releasenotes/notes/puppet4-mysql-func-8c62a5ed35cd1b42.yaml | 4 ++++
 3 files changed, 9 insertions(+), 1 deletion(-)
 create mode 100644 releasenotes/notes/puppet4-mysql-func-8c62a5ed35cd1b42.yaml

diff --git a/manifests/db/mysql.pp b/manifests/db/mysql.pp
index cd21ef0ef..50ce553f8 100644
--- a/manifests/db/mysql.pp
+++ b/manifests/db/mysql.pp
@@ -46,7 +46,7 @@ class neutron::db::mysql (
 
   ::openstacklib::db::mysql { 'neutron':
     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 945905372..5ff5da6e5 100644
--- a/metadata.json
+++ b/metadata.json
@@ -9,6 +9,10 @@
             "name": "puppetlabs/rabbitmq",
             "version_requirement": ">=8.4.0 <9.0.0"
         },
+        {
+            "name": "puppetlabs/mysql",
+            "version_requirement": ">=6.0.0 <9.0.0"
+        },
         {
             "name": "openstack/keystone",
             "version_requirement": ">=14.2.0 <15.0.0"
diff --git a/releasenotes/notes/puppet4-mysql-func-8c62a5ed35cd1b42.yaml b/releasenotes/notes/puppet4-mysql-func-8c62a5ed35cd1b42.yaml
new file mode 100644
index 000000000..9db533ed9
--- /dev/null
+++ b/releasenotes/notes/puppet4-mysql-func-8c62a5ed35cd1b42.yaml
@@ -0,0 +1,4 @@
+---
+upgrade:
+  - |
+    This module now requires a puppetlabs-mysql version >= 6.0.0