summaryrefslogtreecommitdiffstats
path: root/bin
diff options
context:
space:
mode:
authorJustin Shepherd <jshepher@rackspace.com>2011-06-02 21:17:31 -0500
committerJustin Shepherd <jshepher@rackspace.com>2011-06-02 21:17:31 -0500
commitc3fd486a99c889b873f35d3b9757f14ef3a905e8 (patch)
treef5612ac4d57aed398c5bb948d8ab1e464fe03c77 /bin
parentd7d628d58612b94491310a1a03727e1afa9d5ad5 (diff)
parent33a6e766742fdb768defe66d714d5f7a71ee7e5f (diff)
merged trunk
Diffstat (limited to 'bin')
-rwxr-xr-xbin/nova-manage2
1 files changed, 1 insertions, 1 deletions
diff --git a/bin/nova-manage b/bin/nova-manage
index 26c0d776c..5de4d9e81 100755
--- a/bin/nova-manage
+++ b/bin/nova-manage
@@ -536,7 +536,7 @@ class FloatingIpCommands(object):
for floating_ip in floating_ips:
instance = None
if floating_ip['fixed_ip']:
- instance = floating_ip['fixed_ip']['instance']['ec2_id']
+ instance = floating_ip['fixed_ip']['instance']['hostname']
print "%s\t%s\t%s" % (floating_ip['host'],
floating_ip['address'],
instance)