summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJenkins <jenkins@review.openstack.org>2012-07-23 14:55:44 +0000
committerGerrit Code Review <review@openstack.org>2012-07-23 14:55:44 +0000
commit92cdc49c28989ed7b20fd1bf6aa0c602df29379b (patch)
treef6a86b9442f5c6134f8ca64754b7ddabecb8f412
parent3e13afa8ecfb8f6b30ea247098095c079cacfd3b (diff)
parent854be4815127fd703cd91f40fa7511c170351bbc (diff)
downloadnova-92cdc49c28989ed7b20fd1bf6aa0c602df29379b.tar.gz
nova-92cdc49c28989ed7b20fd1bf6aa0c602df29379b.tar.xz
nova-92cdc49c28989ed7b20fd1bf6aa0c602df29379b.zip
Merge "fixes for nova-manage not returning a full list of fixed IPs"
-rwxr-xr-xbin/nova-manage2
1 files changed, 1 insertions, 1 deletions
diff --git a/bin/nova-manage b/bin/nova-manage
index 24e095b92..da9d375e4 100755
--- a/bin/nova-manage
+++ b/bin/nova-manage
@@ -304,7 +304,7 @@ class FixedIpCommands(object):
network = all_networks.get(fixed_ip['network_id'])
if network:
has_ip = True
- if fixed_ip['instance_id']:
+ if fixed_ip.get('instance_id'):
instance = instances_by_id.get(fixed_ip['instance_id'])
if instance:
hostname = instance['hostname']