Merge "Removed unused storage_driver config"
This commit is contained in:
commit
e4e09a7c1d
@ -25,11 +25,6 @@ CENTRAL_OPTS = [
|
||||
help='Number of central worker processes to spawn'),
|
||||
cfg.IntOpt('threads', default=1000,
|
||||
help='Number of central greenthreads to spawn'),
|
||||
cfg.StrOpt('storage_driver', default='sqlalchemy',
|
||||
deprecated_for_removal=True,
|
||||
deprecated_reason='Alternative storage drivers are no longer'
|
||||
'supported.',
|
||||
help='The storage driver to use'),
|
||||
cfg.IntOpt('max_zone_name_len', default=255,
|
||||
help="Maximum zone name length"),
|
||||
cfg.IntOpt('max_recordset_name_len', default=255,
|
||||
|
@ -36,8 +36,6 @@ MDNS_OPTS = [
|
||||
cfg.BoolOpt('query_enforce_tsig', default=False,
|
||||
help='Enforce all incoming queries (including AXFR) are TSIG '
|
||||
'signed'),
|
||||
cfg.StrOpt('storage_driver', default='sqlalchemy',
|
||||
help='The storage driver to use'),
|
||||
cfg.IntOpt('max_message_size', default=65535,
|
||||
help='Maximum message size to emit'),
|
||||
]
|
||||
|
@ -57,8 +57,6 @@ PRODUCER_OPTS = [
|
||||
help='Number of Producer greenthreads to spawn'),
|
||||
cfg.ListOpt('enabled_tasks',
|
||||
help='Enabled tasks to run'),
|
||||
cfg.StrOpt('storage_driver', default='sqlalchemy',
|
||||
help='The storage driver to use'),
|
||||
cfg.BoolOpt('export_synchronous', default=True,
|
||||
help='Whether to allow synchronous zone exports',
|
||||
deprecated_for_removal=True,
|
||||
|
@ -26,8 +26,6 @@ WORKER_OPTS = [
|
||||
help='Number of Worker threads to spawn per process'),
|
||||
# cfg.ListOpt('enabled_tasks',
|
||||
# help='Enabled tasks to run'),
|
||||
cfg.StrOpt('storage_driver', default='sqlalchemy',
|
||||
help='The storage driver to use'),
|
||||
cfg.IntOpt('threshold-percentage', default=100,
|
||||
help='The percentage of servers requiring a successful update '
|
||||
'for a domain change to be considered active'),
|
||||
|
@ -45,8 +45,6 @@ eventlet.monkey_patch(os=False)
|
||||
CONF = designate.conf.CONF
|
||||
LOG = logging.getLogger(__name__)
|
||||
|
||||
CONF.import_opt('storage_driver', 'designate.central',
|
||||
group='service:central')
|
||||
CONF.import_opt('auth_strategy', 'designate.api',
|
||||
group='service:api')
|
||||
CONF.import_opt('connection', 'designate.storage.sqlalchemy',
|
||||
@ -349,11 +347,6 @@ class TestCase(base.BaseTestCase):
|
||||
|
||||
self.useFixture(fixtures.RPCFixture(CONF))
|
||||
|
||||
self.config(
|
||||
storage_driver='sqlalchemy',
|
||||
group='service:central'
|
||||
)
|
||||
|
||||
self.config(
|
||||
emitter_type="noop",
|
||||
group="heartbeat_emitter"
|
||||
|
@ -60,18 +60,6 @@ class MdnsServiceTest(oslotest.base.BaseTestCase):
|
||||
def test_service_name(self):
|
||||
self.assertEqual('mdns', self.service.service_name)
|
||||
|
||||
@mock.patch.object(storage, 'get_storage')
|
||||
def test_storage_driver(self, mock_get_driver):
|
||||
self.service._storage = None
|
||||
|
||||
mock_driver = mock.MagicMock()
|
||||
mock_driver.name = 'noop_driver'
|
||||
mock_get_driver.return_value = mock_driver
|
||||
|
||||
self.assertIsInstance(self.service.storage, mock.MagicMock)
|
||||
|
||||
self.assertTrue(mock_get_driver.called)
|
||||
|
||||
@mock.patch.object(handler, 'RequestHandler')
|
||||
@mock.patch.object(designate.service.DNSService, 'start')
|
||||
@mock.patch.object(designate.utils, 'cache_result')
|
||||
|
@ -0,0 +1,4 @@
|
||||
---
|
||||
other:
|
||||
- |
|
||||
Removed previously deprecated ``storage_driver`` configuration option.
|
Loading…
Reference in New Issue
Block a user