From 941354d6cf44911038448953e195a32a55a42762 Mon Sep 17 00:00:00 2001
From: Thomas Bechtold <tbechtold@suse.com>
Date: Thu, 3 Jan 2019 15:55:29 +0100
Subject: [PATCH] Move/Drop useless SQL related config options

The following config option was moved to another place:

- [Default]sqlite_db : Only used for testing so move it to the test
  config options. That way, it is not visible in the
  manila.conf.sample file

The following config options were removed and are now handled via
oslo.db:

- [Default]sqlite_synchronous : already handled by oslo.db . The new
  place is "[database]sqlite_synchronous" but the deprecated
  section/names are handled
- [Default]sql_idle_timeout : already handled by oslo.db . The new
  place is "[database]connection_recycle_time" but the deprecated
  section/names are handled
- [Default]sql_max_retries : already handled by oslo.db . The new
  place is "[database]max_retries" but the deprecated
  section/names are handled
- [Default]sql_retry_interval : already handled by oslo.db . The new
  place is "[database]retry_interval" but the deprecated
  section/names are handled

Change-Id: I17e9b69d4ce4b8e624313d05f72d25b3fc2b458c
---
 manila/common/config.py | 16 ----------------
 manila/test.py          |  3 +++
 2 files changed, 3 insertions(+), 16 deletions(-)

diff --git a/manila/common/config.py b/manila/common/config.py
index 30825b4308..81bdae7fda 100644
--- a/manila/common/config.py
+++ b/manila/common/config.py
@@ -77,22 +77,6 @@ global_opts = [
     cfg.ListOpt('osapi_share_extension',
                 default=['manila.api.contrib.standard_extensions'],
                 help='The osapi share extensions to load.'),
-    cfg.StrOpt('sqlite_db',
-               default='manila.sqlite',
-               help='The filename to use with sqlite.'),
-    cfg.BoolOpt('sqlite_synchronous',
-                default=True,
-                help='If passed, use synchronous mode for sqlite.'),
-    cfg.IntOpt('sql_idle_timeout',
-               default=3600,
-               help='Timeout before idle SQL connections are reaped.'),
-    cfg.IntOpt('sql_max_retries',
-               default=10,
-               help='Maximum database connection retries during startup. '
-                    '(setting -1 implies an infinite retry count).'),
-    cfg.IntOpt('sql_retry_interval',
-               default=10,
-               help='Interval between retries of opening a SQL connection.'),
     cfg.StrOpt('scheduler_manager',
                default='manila.scheduler.manager.SchedulerManager',
                help='Full class name for the scheduler manager.'),
diff --git a/manila/test.py b/manila/test.py
index ab2273ad41..d488c45c7c 100644
--- a/manila/test.py
+++ b/manila/test.py
@@ -48,6 +48,9 @@ test_opts = [
     cfg.StrOpt('sqlite_clean_db',
                default='clean.sqlite',
                help='File name of clean sqlite database.'),
+    cfg.StrOpt('sqlite_db',
+               default='manila.sqlite',
+               help='The filename to use with sqlite.'),
 ]
 
 CONF = cfg.CONF