Merge "Register DB options independently of engine"

heat/common/config.py

@@ -119,9 +119,12 @@ def register_api_opts():
     rpc.set_defaults(control_exchange='heat')
 
 
+def register_db_opts():
+    cfg.CONF.register_opts(db_opts)
+
+
 def register_engine_opts():
     cfg.CONF.register_opts(engine_opts)
-    cfg.CONF.register_opts(db_opts)
     cfg.CONF.register_opts(service_opts)
     cfg.CONF.register_opts(rpc_opts)
     rpc.set_defaults(control_exchange='heat')

heat/db/__init__.py

@@ -15,4 +15,8 @@
 
 '''Database abstraction for Heat.'''
 
+from heat.common import config
+
+config.register_db_opts()
+
 from heat.db.api import *

heat/engine/__init__.py

@@ -15,3 +15,5 @@
 from heat.common import config
 
 config.register_engine_opts()
+
+from heat import db  # pyflakes_bypass register DB options