Merge with trunk, resolve conflicts and refactor

1 files changed, 15 insertions, 2 deletions

diff --git a/bin/nova-api b/bin/nova-api
index 933202dc8..2d2ef6d0c 100755
--- a/bin/nova-api
+++ b/bin/nova-api
@@ -34,20 +34,33 @@ if os.path.exists(os.path.join(possible_topdir, 'nova', '__init__.py')):
 
 gettext.install('nova', unicode=1)
 
-from nova import apiservice
+from nova import service
 from nova import flags
 from nova import log as logging
+from nova import utils
+from nova import version
 from nova import wsgi
 
+
+LOG = logging.getLogger('nova.api')
+
 FLAGS = flags.FLAGS
 
+
 if __name__ == '__main__':
+    utils.default_flagfile()
     FLAGS(sys.argv)
     logging.setup()
+    LOG.audit(_("Starting nova-api node (version %s)"),
+              version.version_string_with_vcs())
+    LOG.debug(_("Full set of FLAGS:"))
+    for flag in FLAGS:
+        flag_get = FLAGS.get(flag, None)
+        LOG.debug("%(flag)s : %(flag_get)s" % locals())
     conf = wsgi.paste_config_file('nova-api.conf')
     if not conf:
         LOG.error(_("No paste configuration found for: %s"), 'nova-api.conf')
         sys.exit(1)
     else:
-        service = apiservice.serve(conf)
+    	service = service.serve_wsgi(service.ApiService, conf)
         service.wait()