summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorZuul <zuul@review.openstack.org>2019-02-11 20:57:32 +0000
committerGerrit Code Review <review@openstack.org>2019-02-11 20:57:32 +0000
commit79e88cec6ad37cb8f7ddfdda5d29150dde2f28cd (patch)
tree4b50c96e6f89a6eaa58de8216b7c2e430e639750
parentf583de04e218cc4ec42db555e09c0ab06c1b170b (diff)
parent6f143c16addd23c26e6f704e8cdc94f160484068 (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-8ced1e1b5d17fa28.yaml4
3 files changed, 9 insertions, 1 deletions
diff --git a/manifests/db/mysql.pp b/manifests/db/mysql.pp
index bddad7e..cbc8c8a 100644
--- a/manifests/db/mysql.pp
+++ b/manifests/db/mysql.pp
@@ -49,7 +49,7 @@ class glare::db::mysql(
49 49
50 ::openstacklib::db::mysql { 'glare': 50 ::openstacklib::db::mysql { 'glare':
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 4638633..5c6fdf1 100644
--- a/metadata.json
+++ b/metadata.json
@@ -38,6 +38,10 @@
38 "version_requirement": ">= 5.0.0 <6.0.0" 38 "version_requirement": ">= 5.0.0 <6.0.0"
39 }, 39 },
40 { 40 {
41 "name": "puppetlabs/mysql",
42 "version_requirement": ">=6.0.0 <9.0.0"
43 },
44 {
41 "name": "openstack/openstacklib", 45 "name": "openstack/openstacklib",
42 "version_requirement": ">=14.2.0 <15.0.0" 46 "version_requirement": ">=14.2.0 <15.0.0"
43 }, 47 },
diff --git a/releasenotes/notes/puppet4-mysql-func-8ced1e1b5d17fa28.yaml b/releasenotes/notes/puppet4-mysql-func-8ced1e1b5d17fa28.yaml
new file mode 100644
index 0000000..9db533e
--- /dev/null
+++ b/releasenotes/notes/puppet4-mysql-func-8ced1e1b5d17fa28.yaml
@@ -0,0 +1,4 @@
1---
2upgrade:
3 - |
4 This module now requires a puppetlabs-mysql version >= 6.0.0