openstack/puppet-cinder
Code Issues Proposed changes

Merge "Removing deprecated cluster_id db var"

Browse Source
This commit is contained in:
Jenkins 2016-07-26 11:06:11 +00:00 committed by Gerrit Code Review
commit f7538b2bf7
1 changed files with 0 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
manifests/db/mysql.pp
View File

@ -28,11 +28,6 @@
# [*collate*] # [*collate*]
# the database collation. Optional. Defaults to 'utf8_general_ci' # the database collation. Optional. Defaults to 'utf8_general_ci'
# #
# === Deprecated Parameters
#
# [*cluster_id*]
# Unused. No effect.
#
class cinder::db::mysql ( class cinder::db::mysql (
$password, $password,
$dbname = 'cinder', $dbname = 'cinder',
@ -41,15 +36,10 @@ class cinder::db::mysql (
$allowed_hosts = undef, $allowed_hosts = undef,
$charset = 'utf8', $charset = 'utf8',
$collate = 'utf8_general_ci', $collate = 'utf8_general_ci',
$cluster_id = 'localzone',
) { ) {
validate_string($password) validate_string($password)
if $cluster_id != 'localzone' {
warning('The cluster_id parameter is deprecated and has no affect. It will be completely removed from puppet-cinder in the N-release')
}
::openstacklib::db::mysql { 'cinder': ::openstacklib::db::mysql { 'cinder':
user => $user, user => $user,
password_hash => mysql_password($password), password_hash => mysql_password($password),