From 36baeab82aee7d92c9c147aa8afe53f7c8de032b Mon Sep 17 00:00:00 2001
From: Matt Fischer <matt@mattfischer.com>
Date: Wed, 21 Oct 2015 21:06:04 -0600
Subject: [PATCH] Remove deprecated mysql_module

It's been deprecated for some time, time to let go.

Change-Id: I55e161643b8e9d4145ac5e82a18c04b0767cd127
---
 manifests/db/mysql.pp | 8 --------
 manifests/init.pp     | 8 --------
 2 files changed, 16 deletions(-)

diff --git a/manifests/db/mysql.pp b/manifests/db/mysql.pp
index 2f7361047..cf4c55dce 100644
--- a/manifests/db/mysql.pp
+++ b/manifests/db/mysql.pp
@@ -35,9 +35,6 @@
 #   (optional) Deprecated. Does nothing
 #   Defaults to 'localzone'
 #
-# [*mysql_module*]
-#   (optional) Deprecated. Does nothing.
-#
 class nova::db::mysql(
   $password,
   $dbname        = 'nova',
@@ -46,13 +43,8 @@ class nova::db::mysql(
   $charset       = 'utf8',
   $collate       = 'utf8_general_ci',
   $allowed_hosts = undef,
-  $mysql_module  = undef,
 ) {
 
-  if $mysql_module {
-    warning('The mysql_module parameter is deprecated. The latest 2.x mysql module will be used.')
-  }
-
   ::openstacklib::db::mysql { 'nova':
     user          => $user,
     password_hash => mysql_password($password),
diff --git a/manifests/init.pp b/manifests/init.pp
index cd6fcab15..e4ba915f3 100644
--- a/manifests/init.pp
+++ b/manifests/init.pp
@@ -257,9 +257,6 @@
 #   'key-data' }, where 'key-type' is one of (ssh-rsa, ssh-dsa, ssh-ecdsa) and
 #   'key-data' is the contents of the private key file.
 #
-# [*mysql_module*]
-#   (optional) Deprecated. Does nothing.
-#
 # [*notification_driver*]
 #   (optional) Driver or drivers to handle sending notifications.
 #   Value can be a string or a list.
@@ -363,17 +360,12 @@ class nova(
   $os_region_name                     = undef,
   $cinder_catalog_info                = 'volumev2:cinderv2:publicURL',
   # DEPRECATED PARAMETERS
-  $mysql_module                       = undef,
 ) inherits nova::params {
 
   # maintain backward compatibility
   include ::nova::db
   include ::nova::logging
 
-  if $mysql_module {
-    warning('The mysql_module parameter is deprecated. The latest 2.x mysql module will be used.')
-  }
-
   validate_array($enabled_ssl_apis)
   if empty($enabled_ssl_apis) and $use_ssl {
       warning('enabled_ssl_apis is empty but use_ssl is set to true')