From fb936e540962e613a1edc60b0cf2effa1603c62d Mon Sep 17 00:00:00 2001
From: Matt Fischer <matt@mattfischer.com>
Date: Wed, 21 Oct 2015 21:18:24 -0600
Subject: [PATCH] Remove deprcated mysql_module

This has been deprecated and non-functional for awhile, remove it.

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

diff --git a/manifests/db.pp b/manifests/db.pp
index 7a53bbe..dc01e26 100644
--- a/manifests/db.pp
+++ b/manifests/db.pp
@@ -38,9 +38,6 @@
 #  [*sync_db*]
 #    enable dbsync.
 #
-#  [*mysql_module*]
-#    (optional) Deprecated. Does nothing.
-#
 class ceilometer::db (
   $database_connection     = 'mysql://ceilometer:ceilometer@localhost/ceilometer',
   $database_idle_timeout   = 3600,
@@ -50,15 +47,10 @@ class ceilometer::db (
   $database_retry_interval = 10,
   $database_max_overflow   = 20,
   $sync_db                 = true,
-  $mysql_module            = undef,
 ) {
 
   include ::ceilometer::params
 
-  if $mysql_module {
-    warning('The mysql_module parameter is deprecated. The latest 2.x mysql module will be used.')
-  }
-
   Package<| title == 'ceilometer-common' |> -> Class['ceilometer::db']
 
   validate_re($database_connection,
diff --git a/manifests/db/mysql.pp b/manifests/db/mysql.pp
index 020f9f2..f056c66 100644
--- a/manifests/db/mysql.pp
+++ b/manifests/db/mysql.pp
@@ -26,9 +26,6 @@
 #  [*collate*]
 #    the database collation. Optional. Defaults to 'utf8_general_ci'
 #
-#  [*mysql_module*]
-#    (optional) Deprecated. Does nothing.
-#
 class ceilometer::db::mysql(
   $password      = false,
   $dbname        = 'ceilometer',
@@ -37,13 +34,8 @@ class ceilometer::db::mysql(
   $allowed_hosts = undef,
   $charset       = 'utf8',
   $collate       = 'utf8_general_ci',
-  $mysql_module  = undef,
 ) {
 
-  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 { 'ceilometer':
-- 
2.45.2