From c0ffd3502d9bfedc95e6809e758954ba26913f8d Mon Sep 17 00:00:00 2001
From: Tobias Urdin <tobias.urdin@binero.se>
Date: Fri, 8 Feb 2019 10:45:50 +0100
Subject: [PATCH] Update puppetlabs-mysql dependency to min 6.0.0

And change the upper constraint to be the latest
8.0.0 release. See all other patches on this topic.

Change-Id: I30f0367c9eeafe7e8b45c348c3df5630f29fa6a2
---
 README.md                                                    | 4 ++--
 metadata.json                                                | 2 +-
 .../puppetlabs-mysql-update-dependency-7f84516724bbd9d8.yaml | 5 +++++
 spec/acceptance/mysql_spec.rb                                | 2 +-
 4 files changed, 9 insertions(+), 4 deletions(-)
 create mode 100644 releasenotes/notes/puppetlabs-mysql-update-dependency-7f84516724bbd9d8.yaml

diff --git a/README.md b/README.md
index 5fac06d3..4acc70ea 100644
--- a/README.md
+++ b/README.md
@@ -66,7 +66,7 @@ For example, in heat::db::mysql you might declare:
 
 ```
 ::openstacklib::db::mysql { 'heat':
-    password_hash => mysql_password($password),
+    password_hash => mysql::password($password),
     dbname        => $dbname,
     user          => $user,
     host          => $host,
@@ -82,7 +82,7 @@ set up. For example, in keystone::db::mysql you would have:
 
 ```
 ::openstacklib::db::mysql { 'keystone':
-    password_hash => mysql_password($password),
+    password_hash => mysql::password($password),
     dbname        => $dbname,
     user          => $user,
     host          => $host,
diff --git a/metadata.json b/metadata.json
index 0dad1198..d9353cb4 100644
--- a/metadata.json
+++ b/metadata.json
@@ -11,7 +11,7 @@
         },
         {
             "name": "puppetlabs/mysql",
-            "version_requirement": ">=3.10.0 <7.0.0"
+            "version_requirement": ">=6.0.0 <9.0.0"
         },
         {
             "name": "puppetlabs/stdlib",
diff --git a/releasenotes/notes/puppetlabs-mysql-update-dependency-7f84516724bbd9d8.yaml b/releasenotes/notes/puppetlabs-mysql-update-dependency-7f84516724bbd9d8.yaml
new file mode 100644
index 00000000..df97bff6
--- /dev/null
+++ b/releasenotes/notes/puppetlabs-mysql-update-dependency-7f84516724bbd9d8.yaml
@@ -0,0 +1,5 @@
+---
+upgrade:
+  - |
+    The openstacklib module and all other OpenStack modules depending on this
+    module now requires a puppetlabs-mysql version >= 6.0.0
diff --git a/spec/acceptance/mysql_spec.rb b/spec/acceptance/mysql_spec.rb
index 00889718..e07cb531 100644
--- a/spec/acceptance/mysql_spec.rb
+++ b/spec/acceptance/mysql_spec.rb
@@ -11,7 +11,7 @@ describe 'openstacklib mysql' do
       class { '::mysql::server': }
 
       ::openstacklib::db::mysql { 'beaker':
-        password_hash => mysql_password('keystone'),
+        password_hash => mysql::password('keystone'),
         allowed_hosts => '127.0.0.1',
       }
       EOS