register oslo_db options at runtime

Change-Id: I601e1a3dc3a0d416400fef7f502c550af88adaa4

ceilometer/service.py

@@ -17,6 +17,7 @@ import sys
 
 from keystoneauth1 import loading as ka_loading
 from oslo_config import cfg
+from oslo_db import options as db_options
 import oslo_i18n
 from oslo_log import log
 from oslo_policy import opts as policy_opts
@@ -78,6 +79,7 @@ def prepare_service(argv=None, config_files=None, conf=None):
     log.set_defaults(default_log_levels=log_levels)
     defaults.set_cors_middleware_defaults()
     policy_opts.set_defaults(conf)
+    db_options.set_defaults(conf)
 
     conf(argv[1:], project='ceilometer', validate_default_values=True,
          version=version.version_info.version_string(),

ceilometer/storage/__init__.py

@@ -16,7 +16,6 @@
 """
 
 from oslo_config import cfg
-from oslo_db import options as db_options
 from oslo_log import log
 import six.moves.urllib.parse as urlparse
 from stevedore import driver
@@ -57,9 +56,6 @@ OPTS = [
 cfg.CONF.register_opts(OPTS, group='database')
 
 
-db_options.set_defaults(cfg.CONF)
-
-
 class StorageUnknownWriteError(Exception):
     """Error raised when an unknown error occurs while recording."""
 

ceilometer/tests/db.py

@@ -28,6 +28,7 @@ from six.moves.urllib import parse as urlparse
 import sqlalchemy
 from testtools import testcase
 
+from ceilometer import service
 from ceilometer import storage
 from ceilometer.tests import base as test_base
 try:
@@ -191,7 +192,7 @@ class TestBase(test_base.BaseTestCase):
                 'Test is not applicable for %s' % engine)
 
         self.CONF = self.useFixture(fixture_config.Config()).conf
-        self.CONF([], project='ceilometer', validate_default_values=True)
+        service.prepare_service([], [], self.CONF)
 
         manager = self.DRIVER_MANAGERS.get(engine)
         if not manager:

ceilometer/tests/functional/test_collector.py

@@ -26,6 +26,7 @@ from ceilometer import collector
 from ceilometer import dispatcher
 from ceilometer.publisher import utils
 from ceilometer import sample
+from ceilometer import service
 from ceilometer.tests import base as tests_base
 
 
@@ -42,6 +43,7 @@ class TestCollector(tests_base.BaseTestCase):
     def setUp(self):
         super(TestCollector, self).setUp()
         self.CONF = self.useFixture(fixture_config.Config()).conf
+        service.prepare_service([], [], self.CONF)
         self.CONF.import_opt("connection", "oslo_db.options", group="database")
         self.CONF.set_override("connection", "log://", group='database')
         self.CONF.set_override('telemetry_secret', 'not-so-secret',

ceilometer/tests/functional/test_notification.py

@@ -29,6 +29,7 @@ from ceilometer.agent import plugin_base
 from ceilometer import messaging
 from ceilometer import notification
 from ceilometer.publisher import test as test_publisher
+from ceilometer import service
 from ceilometer.tests import base as tests_base
 
 TEST_NOTICE_CTXT = {
@@ -100,6 +101,7 @@ class TestNotification(tests_base.BaseTestCase):
     def setUp(self):
         super(TestNotification, self).setUp()
         self.CONF = self.useFixture(fixture_config.Config()).conf
+        service.prepare_service([], [], self.CONF)
         self.CONF.set_override("connection", "log://", group='database')
         self.CONF.set_override("backend_url", None, group="coordination")
         self.CONF.set_override("disable_non_metric_meters", False,
@@ -225,8 +227,7 @@ class BaseRealNotification(tests_base.BaseTestCase):
     def setUp(self):
         super(BaseRealNotification, self).setUp()
         self.CONF = self.useFixture(fixture_config.Config()).conf
-        # Dummy config file to avoid looking for system config
-        self.CONF([], project='ceilometer', validate_default_values=True)
+        service.prepare_service([], [], self.CONF)
         self.setup_messaging(self.CONF, 'nova')
 
         pipeline_cfg_file = self.setup_pipeline(['vcpus', 'memory'])
@@ -524,7 +525,7 @@ class TestRealNotificationMultipleAgents(tests_base.BaseTestCase):
     def setUp(self):
         super(TestRealNotificationMultipleAgents, self).setUp()
         self.CONF = self.useFixture(fixture_config.Config()).conf
-        self.CONF([], project='ceilometer', validate_default_values=True)
+        service.prepare_service([], [], self.CONF)
         self.setup_messaging(self.CONF, 'nova')
 
         pipeline_cfg_file = self.setup_pipeline(['instance', 'memory'])