incorporate feedback from termie

2 files changed, 9 insertions, 8 deletions

diff --git a/nova/compute/api.py b/nova/compute/api.py
index cec978d75..cb3898f72 100644
--- a/nova/compute/api.py
+++ b/nova/compute/api.py
@@ -477,21 +477,22 @@ class API(base.Base):
                 output['token'])}
 
     def get_vnc_console(self, context, instance_id):
-        """Get a url to an AJAX Console"""
+        """Get a url to a VNC Console."""
         instance = self.get(context, instance_id)
         output = self._call_compute_message('get_vnc_console',
                                             context,
                                             instance_id)
         rpc.cast(context, '%s' % FLAGS.vnc_console_proxy_topic,
                  {'method': 'authorize_vnc_console',
-                  'args': {'token': output['token'], 'host': output['host'],
+                  'args': {'token': output['token'],
+                           'host': output['host'],
                   'port': output['port']}})
 
-        time.sleep(1)
-
-        return {'url': '%s/vnc_auto.html?token=%s&host=%s&port=%s' %
-                (FLAGS.vnc_console_proxy_url,
-                output['token'], 'hostignore', 'portignore')}
+        return {'url': '%s/vnc_auto.html?token=%s&host=%s&port=%s' % (
+                       FLAGS.vnc_console_proxy_url,
+                       output['token'],
+                       'hostignore',
+                       'portignore')}
 
     def get_console_output(self, context, instance_id):
         """Get console output for an an instance"""
diff --git a/nova/compute/manager.py b/nova/compute/manager.py
index e53b36b34..64982d8ff 100644
--- a/nova/compute/manager.py
+++ b/nova/compute/manager.py
@@ -559,7 +559,7 @@ class ComputeManager(manager.Manager):
 
     @exception.wrap_exception
     def get_vnc_console(self, context, instance_id):
-        """Return connection information for an vnc console"""
+        """Return connection information for an vnc console."""
         context = context.elevated()
         LOG.debug(_("instance %s: getting vnc console"), instance_id)
         instance_ref = self.db.instance_get(context, instance_id)