From 78c928a9549601313eba37e2693594c9f76abf80 Mon Sep 17 00:00:00 2001
From: Matt Fischer <matt@mattfischer.com>
Date: Wed, 21 Oct 2015 21:12:49 -0600
Subject: [PATCH] Remove deprcated mysql options.

These have been deprecated for some time, time to let go.

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

diff --git a/manifests/db/mysql.pp b/manifests/db/mysql.pp
index bab6c8420..bb3415537 100644
--- a/manifests/db/mysql.pp
+++ b/manifests/db/mysql.pp
@@ -26,11 +26,6 @@
 #  [*collate*]
 #    the database collation. Optional. Defaults to 'utf8_general_ci'
 #
-#  [*mysql_module*]
-#   (optional) Deprecated. Does nothing.
-#
-#  [*cluster_id*]
-#   (optional) Deprecated. Does nothing.
 class neutron::db::mysql (
   $password,
   $dbname        = 'neutron',
@@ -40,17 +35,10 @@ class neutron::db::mysql (
   $charset       = 'utf8',
   $collate       = 'utf8_general_ci',
   # DEPRECATED
-  $mysql_module  = undef,
-  $cluster_id    = 'localzone',
 ) {
 
-  if $mysql_module {
-    warning('The mysql_module parameter is deprecated. The latest 2.x mysql module will be used.')
-  }
-
   validate_string($password)
 
-
   ::openstacklib::db::mysql { 'neutron':
     user          => $user,
     password_hash => mysql_password($password),