Merge "Register objects in more services"

nova/cmd/all.py

@@ -29,6 +29,7 @@ import sys
 from oslo.config import cfg
 
 from nova import config
+from nova import objects
 from nova.objectstore import s3server
 from nova.openstack.common.gettextutils import _
 from nova.openstack.common import log as logging
@@ -49,6 +50,7 @@ def main():
     logging.setup("nova")
     LOG = logging.getLogger('nova.all')
     utils.monkey_patch()
+    objects.register_all()
     launcher = service.process_launcher()
 
     # nova-api

nova/cmd/api.py

@@ -25,6 +25,7 @@ import sys
 from oslo.config import cfg
 
 from nova import config
+from nova import objects
 from nova.openstack.common import log as logging
 from nova.openstack.common.report import guru_meditation_report as gmr
 from nova import service
@@ -40,6 +41,7 @@ def main():
     config.parse_args(sys.argv)
     logging.setup("nova")
     utils.monkey_patch()
+    objects.register_all()
 
     gmr.TextGuruMeditation.setup_autorun(version)
 

nova/cmd/api_ec2.py

@@ -21,6 +21,7 @@ import sys
 from oslo.config import cfg
 
 from nova import config
+from nova import objects
 from nova.openstack.common import log as logging
 from nova.openstack.common.report import guru_meditation_report as gmr
 from nova import service
@@ -36,6 +37,7 @@ def main():
     config.parse_args(sys.argv)
     logging.setup("nova")
     utils.monkey_patch()
+    objects.register_all()
 
     gmr.TextGuruMeditation.setup_autorun(version)
 

nova/cmd/api_metadata.py

@@ -22,6 +22,7 @@ from oslo.config import cfg
 
 from nova.conductor import rpcapi as conductor_rpcapi
 from nova import config
+from nova import objects
 from nova.objects import base as objects_base
 from nova.openstack.common import log as logging
 from nova.openstack.common.report import guru_meditation_report as gmr
@@ -39,6 +40,7 @@ def main():
     config.parse_args(sys.argv)
     logging.setup("nova")
     utils.monkey_patch()
+    objects.register_all()
 
     gmr.TextGuruMeditation.setup_autorun(version)
 

nova/cmd/api_os_compute.py

@@ -21,6 +21,7 @@ import sys
 from oslo.config import cfg
 
 from nova import config
+from nova import objects
 from nova.openstack.common import log as logging
 from nova.openstack.common.report import guru_meditation_report as gmr
 from nova import service
@@ -36,6 +37,7 @@ def main():
     config.parse_args(sys.argv)
     logging.setup("nova")
     utils.monkey_patch()
+    objects.register_all()
 
     gmr.TextGuruMeditation.setup_autorun(version)
 

nova/cmd/baremetal_deploy_helper.py

@@ -30,6 +30,7 @@ from wsgiref import simple_server
 
 from nova import config
 from nova import context as nova_context
+from nova import objects
 from nova.openstack.common import excutils
 from nova.openstack.common.gettextutils import _
 from nova.openstack.common import log as logging
@@ -369,6 +370,7 @@ def main():
     logging.setup("nova")
     global LOG
     LOG = logging.getLogger('nova.virt.baremetal.deploy_helper')
+    objects.register_all()
     app = BareMetalDeploy()
     srv = simple_server.make_server('', 10000, app)
     srv.serve_forever()

nova/cmd/baremetal_manage.py

@@ -58,6 +58,7 @@ from oslo.config import cfg
 import six
 
 from nova import config
+from nova import objects
 from nova.openstack.common import cliutils
 from nova.openstack.common.gettextutils import _
 from nova.openstack.common import log as logging
@@ -164,6 +165,8 @@ def main():
         print(_('Please re-run nova-manage as root.'))
         return(2)
 
+    objects.register_all()
+
     if CONF.category.name == "version":
         print(version.version_string_with_package())
         return(0)

nova/cmd/cells.py

@@ -20,6 +20,7 @@ import sys
 from oslo.config import cfg
 
 from nova import config
+from nova import objects
 from nova.openstack.common import log as logging
 from nova.openstack.common.report import guru_meditation_report as gmr
 from nova import service
@@ -35,6 +36,7 @@ def main():
     config.parse_args(sys.argv)
     logging.setup('nova')
     utils.monkey_patch()
+    objects.register_all()
 
     gmr.TextGuruMeditation.setup_autorun(version)
 

nova/cmd/compute.py

@@ -55,10 +55,10 @@ def block_db_access():
 
 
 def main():
-    objects.register_all()
     config.parse_args(sys.argv)
     logging.setup('nova')
     utils.monkey_patch()
+    objects.register_all()
 
     gmr.TextGuruMeditation.setup_autorun(version)
 

nova/cmd/conductor.py

@@ -31,10 +31,10 @@ CONF.import_opt('topic', 'nova.conductor.api', group='conductor')
 
 
 def main():
-    objects.register_all()
     config.parse_args(sys.argv)
     logging.setup("nova")
     utils.monkey_patch()
+    objects.register_all()
 
     gmr.TextGuruMeditation.setup_autorun(version)
 

nova/cmd/dhcpbridge.py

@@ -32,6 +32,7 @@ from nova import context
 import nova.db.api
 from nova import exception
 from nova.network import rpcapi as network_rpcapi
+from nova import objects
 from nova.objects import base as objects_base
 from nova.objects import network as network_obj
 from nova.openstack.common.gettextutils import _
@@ -120,6 +121,7 @@ def main():
     logging.setup("nova")
     global LOG
     LOG = logging.getLogger('nova.dhcpbridge')
+    objects.register_all()
 
     if not CONF.conductor.use_local:
         block_db_access()

nova/cmd/manage.py

@@ -72,6 +72,7 @@ from nova import context
 from nova import db
 from nova.db import migration
 from nova import exception
+from nova import objects
 from nova.openstack.common import cliutils
 from nova.openstack.common.db import exception as db_exc
 from nova.openstack.common.gettextutils import _
@@ -1355,6 +1356,8 @@ def main():
         print(_('Please re-run nova-manage as root.'))
         return(2)
 
+    objects.register_all()
+
     if CONF.category.name == "version":
         print(version.version_string_with_package())
         return(0)

nova/cmd/network.py

@@ -25,6 +25,7 @@ from nova.conductor import rpcapi as conductor_rpcapi
 from nova import config
 import nova.db.api
 from nova import exception
+from nova import objects
 from nova.objects import base as objects_base
 from nova.openstack.common.gettextutils import _
 from nova.openstack.common import log as logging
@@ -57,6 +58,7 @@ def main():
     config.parse_args(sys.argv)
     logging.setup("nova")
     utils.monkey_patch()
+    objects.register_all()
 
     gmr.TextGuruMeditation.setup_autorun(version)
 

nova/cmd/scheduler.py

@@ -21,6 +21,7 @@ import sys
 from oslo.config import cfg
 
 from nova import config
+from nova import objects
 from nova.openstack.common import log as logging
 from nova.openstack.common.report import guru_meditation_report as gmr
 from nova import service
@@ -35,6 +36,7 @@ def main():
     config.parse_args(sys.argv)
     logging.setup("nova")
     utils.monkey_patch()
+    objects.register_all()
 
     gmr.TextGuruMeditation.setup_autorun(version)