summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorZuul <zuul@review.openstack.org>2019-02-11 22:26:24 +0000
committerGerrit Code Review <review@openstack.org>2019-02-11 22:26:24 +0000
commit660bdf7abc35740fa4e89b034019b5ee655f4f44 (patch)
tree9837d8be060128ba50ed8afc0ad56a69cc85b897
parent9910ae3f210d71ce0d6190a78bbf0c11de825d9b (diff)
parentbe384424e4befacc538168b35b4799da210ab86b (diff)
Merge "Use puppet 4 compatible mysql functions"
-rw-r--r--manifests/db/mysql.pp2
-rw-r--r--metadata.json4
-rw-r--r--releasenotes/notes/puppet4-mysql-func-9583edec939bbaa2.yaml4
3 files changed, 9 insertions, 1 deletions
diff --git a/manifests/db/mysql.pp b/manifests/db/mysql.pp
index b543923..a48201d 100644
--- a/manifests/db/mysql.pp
+++ b/manifests/db/mysql.pp
@@ -49,7 +49,7 @@ class heat::db::mysql(
49 49
50 ::openstacklib::db::mysql { 'heat': 50 ::openstacklib::db::mysql { 'heat':
51 user => $user, 51 user => $user,
52 password_hash => mysql_password($password), 52 password_hash => mysql::password($password),
53 dbname => $dbname, 53 dbname => $dbname,
54 host => $host, 54 host => $host,
55 charset => $charset, 55 charset => $charset,
diff --git a/metadata.json b/metadata.json
index 56c384c..85c76b9 100644
--- a/metadata.json
+++ b/metadata.json
@@ -14,6 +14,10 @@
14 "version_requirement": ">=8.4.0 <9.0.0" 14 "version_requirement": ">=8.4.0 <9.0.0"
15 }, 15 },
16 { 16 {
17 "name": "puppetlabs/mysql",
18 "version_requirement": ">=6.0.0 <9.0.0"
19 },
20 {
17 "name": "puppetlabs/stdlib", 21 "name": "puppetlabs/stdlib",
18 "version_requirement": ">=5.0.0 <6.0.0" 22 "version_requirement": ">=5.0.0 <6.0.0"
19 }, 23 },
diff --git a/releasenotes/notes/puppet4-mysql-func-9583edec939bbaa2.yaml b/releasenotes/notes/puppet4-mysql-func-9583edec939bbaa2.yaml
new file mode 100644
index 0000000..9db533e
--- /dev/null
+++ b/releasenotes/notes/puppet4-mysql-func-9583edec939bbaa2.yaml
@@ -0,0 +1,4 @@
1---
2upgrade:
3 - |
4 This module now requires a puppetlabs-mysql version >= 6.0.0