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: Ibec58311585315e8ec4f748ec26b5fc2dba78a67

diff --git a/manifests/db/mysql.pp b/manifests/db/mysql.pp
index d534bd2b581324be4bcb169c773c65ecd1dfcdbc..bc9d26256accb55e696a66c908f982870d0b9d0a 100644 (file)
--- a/manifests/db/mysql.pp
+++ b/manifests/db/mysql.pp
@@ -48,7 +48,7 @@ class ceilometer::db::mysql(
 
   ::openstacklib::db::mysql { 'ceilometer':
     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 6c8d5f2b13ae29c9f4e8f105218ac6eaf5cb2337..0e2d2e72e31b84072a2c2438d279aea1039d4369 100644 (file)
--- 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": "openstack/keystone",
             "version_requirement": ">=14.2.0 <15.0.0"

diff --git a/releasenotes/notes/puppet4-mysql-func-19d33ccd49701b0d.yaml b/releasenotes/notes/puppet4-mysql-func-19d33ccd49701b0d.yaml
new file mode 100644 (file)
index 0000000..9db533e
--- /dev/null
+++ b/releasenotes/notes/puppet4-mysql-func-19d33ccd49701b0d.yaml
@@ -0,0 +1,4 @@
+---
+upgrade:
+  - |
+    This module now requires a puppetlabs-mysql version >= 6.0.0