summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorAdam Gandelman <adamg@canonical.com>2012-02-22 10:58:12 -0800
committerAdam Gandelman <adamg@canonical.com>2012-02-22 10:58:12 -0800
commit74396d58810e9851a6d33aef3dc3b2185154abcb (patch)
treeee772fc26ab6feb98d7c47a8dba3492a8301f15d
parent00f8caaeff15b03062db99290b8ebbe96a6712c5 (diff)
downloadnova-74396d58810e9851a6d33aef3dc3b2185154abcb.tar.gz
nova-74396d58810e9851a6d33aef3dc3b2185154abcb.tar.xz
nova-74396d58810e9851a6d33aef3dc3b2185154abcb.zip
nova-manage: Fix 'fixed list'
Fix 'nova-manage fixed list' Fixes bug 938702 Change-Id: I65a0a57ac8e16b605eeee963146d4dba582dc077
-rwxr-xr-xbin/nova-manage6
1 files changed, 4 insertions, 2 deletions
diff --git a/bin/nova-manage b/bin/nova-manage
index 35f6f197f..74bc7899e 100755
--- a/bin/nova-manage
+++ b/bin/nova-manage
@@ -650,12 +650,14 @@ class FixedIpCommands(object):
hostname = None
host = None
mac_address = None
- if fixed_ip['instance']:
+ network = db.network_get(context.get_admin_context(),
+ fixed_ip['network_id'])
+ if fixed_ip['instance_id']:
instance = instances_by_id[fixed_ip['instance_id']]
hostname = instance['hostname']
host = instance['host']
print "%-18s\t%-15s\t%-15s\t%s" % (
- fixed_ip['network']['cidr'],
+ network['cidr'],
fixed_ip['address'],
hostname, host)