Browse Source

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
Thomas Bechtold 3 months ago
parent
commit
941354d6cf
2 changed files with 3 additions and 16 deletions
  1. 0
    16
      manila/common/config.py
  2. 3
    0
      manila/test.py

+ 0
- 16
manila/common/config.py View File

@@ -77,22 +77,6 @@ global_opts = [
77 77
     cfg.ListOpt('osapi_share_extension',
78 78
                 default=['manila.api.contrib.standard_extensions'],
79 79
                 help='The osapi share extensions to load.'),
80
-    cfg.StrOpt('sqlite_db',
81
-               default='manila.sqlite',
82
-               help='The filename to use with sqlite.'),
83
-    cfg.BoolOpt('sqlite_synchronous',
84
-                default=True,
85
-                help='If passed, use synchronous mode for sqlite.'),
86
-    cfg.IntOpt('sql_idle_timeout',
87
-               default=3600,
88
-               help='Timeout before idle SQL connections are reaped.'),
89
-    cfg.IntOpt('sql_max_retries',
90
-               default=10,
91
-               help='Maximum database connection retries during startup. '
92
-                    '(setting -1 implies an infinite retry count).'),
93
-    cfg.IntOpt('sql_retry_interval',
94
-               default=10,
95
-               help='Interval between retries of opening a SQL connection.'),
96 80
     cfg.StrOpt('scheduler_manager',
97 81
                default='manila.scheduler.manager.SchedulerManager',
98 82
                help='Full class name for the scheduler manager.'),

+ 3
- 0
manila/test.py View File

@@ -48,6 +48,9 @@ test_opts = [
48 48
     cfg.StrOpt('sqlite_clean_db',
49 49
                default='clean.sqlite',
50 50
                help='File name of clean sqlite database.'),
51
+    cfg.StrOpt('sqlite_db',
52
+               default='manila.sqlite',
53
+               help='The filename to use with sqlite.'),
51 54
 ]
52 55
 
53 56
 CONF = cfg.CONF

Loading…
Cancel
Save