Register DB options independently of engine

We need a script that will just manage database migrations (for bug
1072949), so for this purpose we want to register only the DB options, not
all of the engine options.

Change-Id: I99bb8d5800741d71572a14c3a5a33dcf0e1b0268

diff --git a/heat/common/config.py b/heat/common/config.py
index 0b433bfeb99af1f7953c7dfd2c8068499590ed06..e84fc74964c80301ff7b3c4d3c061e2464fd47a8 100644 (file)
--- a/heat/common/config.py
+++ b/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')

diff --git a/heat/db/__init__.py b/heat/db/__init__.py
index 998253999b1468add7e1641c5efb56ea3546dd31..c43bd22c83c56b2cbfe63e7164905c3973c30c81 100644 (file)
--- a/heat/db/__init__.py
+++ b/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 *

diff --git a/heat/engine/__init__.py b/heat/engine/__init__.py
index 024c1d749fe9ccaa66e0346529893acc85750c90..7675cc57c19b5c93c15fd2b78c6d043f896e59d4 100644 (file)
--- a/heat/engine/__init__.py
+++ b/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