From 16f2265203680d4bdcda26fc7f789302689cafc9 Mon Sep 17 00:00:00 2001 From: Tobias Urdin Date: Fri, 8 Feb 2019 12:14:47 +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: I82ecf608820f940cffc53b679545d3e9aee71195 --- manifests/db/mysql.pp | 2 +- metadata.json | 4 ++++ releasenotes/notes/puppet4-mysql-func-d8adf965e1f5ee8f.yaml | 4 ++++ 3 files changed, 9 insertions(+), 1 deletion(-) create mode 100644 releasenotes/notes/puppet4-mysql-func-d8adf965e1f5ee8f.yaml diff --git a/manifests/db/mysql.pp b/manifests/db/mysql.pp index da15f08b7..7d0a4a174 100644 --- a/manifests/db/mysql.pp +++ b/manifests/db/mysql.pp @@ -49,7 +49,7 @@ class keystone::db::mysql( ::openstacklib::db::mysql { 'keystone': 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 6126b8b22..3935efb03 100644 --- a/metadata.json +++ b/metadata.json @@ -17,6 +17,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/openstacklib", "version_requirement": ">=14.2.0 <15.0.0" diff --git a/releasenotes/notes/puppet4-mysql-func-d8adf965e1f5ee8f.yaml b/releasenotes/notes/puppet4-mysql-func-d8adf965e1f5ee8f.yaml new file mode 100644 index 000000000..9db533ed9 --- /dev/null +++ b/releasenotes/notes/puppet4-mysql-func-d8adf965e1f5ee8f.yaml @@ -0,0 +1,4 @@ +--- +upgrade: + - | + This module now requires a puppetlabs-mysql version >= 6.0.0