diff options
| author | Todd Willey <todd@ansolabs.com> | 2011-06-01 19:44:01 -0400 |
|---|---|---|
| committer | Todd Willey <todd@ansolabs.com> | 2011-06-01 19:44:01 -0400 |
| commit | 5c187a17216b76d730c3dcf983f905d2b5ce1bd9 (patch) | |
| tree | 2136b5a09676ab57b67fec842b47757a52c2906e /bin | |
| parent | 2c1dd72060fccbe7f32a6aa08c1ce67476806680 (diff) | |
| parent | 78093e8101d1981fc1fbafc963023bc70ad6b3b6 (diff) | |
Merge trunk.
Diffstat (limited to 'bin')
| -rwxr-xr-x | bin/nova-manage | 2 |
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) |