Merging trunk

3 files changed, 13 insertions, 5 deletions

diff --git a/bin/nova-ajax-console-proxy b/bin/nova-ajax-console-proxy
index 1e11c6d58..bbd60bade 100755
--- a/bin/nova-ajax-console-proxy
+++ b/bin/nova-ajax-console-proxy
@@ -63,10 +63,16 @@ class AjaxConsoleProxy(object):
 
     def __call__(self, env, start_response):
         try:
-            req_url = '%s://%s%s?%s' % (env['wsgi.url_scheme'],
-                                        env['HTTP_HOST'],
-                                        env['PATH_INFO'],
-                                        env['QUERY_STRING'])
+            if 'QUERY_STRING' in env:
+                req_url = '%s://%s%s?%s' % (env['wsgi.url_scheme'],
+                                            env['HTTP_HOST'],
+                                            env['PATH_INFO'],
+                                            env['QUERY_STRING'])
+            else:
+                req_url = '%s://%s%s' % (env['wsgi.url_scheme'],
+                                         env['HTTP_HOST'],
+                                         env['PATH_INFO'])
+
             if 'HTTP_REFERER' in env:
                 auth_url = env['HTTP_REFERER']
             else:
diff --git a/bin/nova-api b/bin/nova-api
index cf140570a..14be4b841 100755
--- a/bin/nova-api
+++ b/bin/nova-api
@@ -36,6 +36,7 @@ gettext.install('nova', unicode=1)
 
 from nova import flags
 from nova import log as logging
+from nova import utils
 from nova import version
 from nova import wsgi
 
@@ -80,6 +81,7 @@ def run_app(paste_config_file):
 
 
 if __name__ == '__main__':
+    utils.default_flagfile()
     FLAGS(sys.argv)
     logging.setup()
     LOG.audit(_("Starting nova-api node (version %s)"),
diff --git a/bin/nova-manage b/bin/nova-manage
index b603c8b07..89332f2af 100755
--- a/bin/nova-manage
+++ b/bin/nova-manage
@@ -553,7 +553,7 @@ class ServiceCommands(object):
         args: [host] [service]"""
         ctxt = context.get_admin_context()
         now = datetime.datetime.utcnow()
-        services = db.service_get_all(ctxt)
+        services = db.service_get_all(ctxt) + db.service_get_all(ctxt, True)
         if host:
             services = [s for s in services if s['host'] == host]
         if service: