From a584401954f33555a8da85db0b740187ff2bd1af Mon Sep 17 00:00:00 2001
From: cdelatte <craig.delatte@twcable.com>
Date: Mon, 25 Jul 2016 08:35:56 -0400
Subject: [PATCH] Removing deprecated cluster_id db var

removing the deplicated cluster_id variable for the mysql module.
we were removing as part of another change and it was requested to make
this it's own change

Change-Id: Id341d21d7d395ba8a94548df4a5fa844956a7a47
---
 manifests/db/mysql.pp | 10 ----------
 1 file changed, 10 deletions(-)

diff --git a/manifests/db/mysql.pp b/manifests/db/mysql.pp
index 49265d34..ce7f1c61 100644
--- a/manifests/db/mysql.pp
+++ b/manifests/db/mysql.pp
@@ -28,11 +28,6 @@
 # [*collate*]
 #   the database collation. Optional. Defaults to 'utf8_general_ci'
 #
-# === Deprecated Parameters
-#
-# [*cluster_id*]
-#   Unused. No effect.
-#
 class cinder::db::mysql (
   $password,
   $dbname        = 'cinder',
@@ -41,15 +36,10 @@ class cinder::db::mysql (
   $allowed_hosts = undef,
   $charset       = 'utf8',
   $collate       = 'utf8_general_ci',
-  $cluster_id    = 'localzone',
 ) {
 
   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':
     user          => $user,
     password_hash => mysql_password($password),