From d42058d77afba7991a60358354f2b0061dba955e Mon Sep 17 00:00:00 2001
From: zhubingbing <zhu.bingbing@99cloud.net>
Date: Fri, 15 Jun 2018 15:23:10 +0800
Subject: [PATCH] Remove sqlite_db option

The sqlite_db parameter has been deprecated for one year.
We can remove it.

Change-Id: I5fbb62f517d2b3ad983d66f28d9d0a2573c0413b
---
 manifests/db.pp                                    | 14 --------------
 .../notes/remove_sqlite_db-8703ae2068157637.yaml   |  3 +++
 2 files changed, 3 insertions(+), 14 deletions(-)
 create mode 100644 releasenotes/notes/remove_sqlite_db-8703ae2068157637.yaml

diff --git a/manifests/db.pp b/manifests/db.pp
index 08711eb..804fc5f 100644
--- a/manifests/db.pp
+++ b/manifests/db.pp
@@ -100,12 +100,6 @@
 #   (Optional) Enable the experimental use of thread pooling for all DB API calls (boolean value)
 #   Defaults to $::os_service_default
 #
-# DEPRECATED PARAMETERS
-#
-# [*sqlite_db*]
-#   (Optional) The file name to use with SQLite.
-#   Defaults to undef
-#
 define oslo::db(
   $sqlite_synchronous     = $::os_service_default,
   $backend                = $::os_service_default,
@@ -129,8 +123,6 @@ define oslo::db(
   $db_max_retry_interval  = $::os_service_default,
   $db_max_retries         = $::os_service_default,
   $use_tpool              = $::os_service_default,
-  # DEPRECATED PARAMETERS
-  $sqlite_db              = undef,
 ){
 
   include ::oslo::params
@@ -176,12 +168,6 @@ define oslo::db(
     }
   }
 
-  if $sqlite_db {
-    warning("The sqlite_db parameter is now deprecated and will be removed in the \
-future release. Please use configuration option connection or slave_connection \
-to connect to the database.")
-  }
-
   $database_options = {
     'database/sqlite_synchronous'    => { value => $sqlite_synchronous },
     'database/backend'               => { value => $backend },
diff --git a/releasenotes/notes/remove_sqlite_db-8703ae2068157637.yaml b/releasenotes/notes/remove_sqlite_db-8703ae2068157637.yaml
new file mode 100644
index 0000000..0dedd99
--- /dev/null
+++ b/releasenotes/notes/remove_sqlite_db-8703ae2068157637.yaml
@@ -0,0 +1,3 @@
+---
+upgrade:
+  - Deprecated sqlite_db option has been removed.