summaryrefslogtreecommitdiffstats
path: root/nova/compute
diff options
context:
space:
mode:
authorJenkins <jenkins@review.openstack.org>2012-08-17 20:14:21 +0000
committerGerrit Code Review <review@openstack.org>2012-08-17 20:14:21 +0000
commita10be151ad9f62bb916498c8dae42e4b54dfc779 (patch)
treede1286ba1bf5cc8e6f33a0049fd9addf74ffa190 /nova/compute
parentc5a0f0314818b63bdf2d5acb1c9407adab64ae6f (diff)
parentfa16d173938b30af4e1cc6b312a75b12aff6c424 (diff)
Merge "Fix get_vnc_console race."
Diffstat (limited to 'nova/compute')
-rw-r--r--nova/compute/api.py3
1 files changed, 3 insertions, 0 deletions
diff --git a/nova/compute/api.py b/nova/compute/api.py
index e7f9368ea..ebf67729d 100644
--- a/nova/compute/api.py
+++ b/nova/compute/api.py
@@ -1627,6 +1627,9 @@ class API(base.Base):
@wrap_check_policy
def get_vnc_console(self, context, instance, console_type):
"""Get a url to an instance Console."""
+ if not instance['host']:
+ raise exception.InstanceNotReady(instance=instance)
+
connect_info = self.compute_rpcapi.get_vnc_console(context,
instance=instance, console_type=console_type)