diff options
| author | Jenkins <jenkins@review.openstack.org> | 2012-08-03 01:04:57 +0000 |
|---|---|---|
| committer | Gerrit Code Review <review@openstack.org> | 2012-08-03 01:04:57 +0000 |
| commit | 87dcb13117459da0e92b98feadab8a4ecba2c4f9 (patch) | |
| tree | 47ea4d59e930b50e5c84e3289c37bd88b7e984d1 | |
| parent | b8bae714f402c90ce78da7be80d4dad1d4285d3b (diff) | |
| parent | 143b4671cce2a0996018509f6ce38c0902acde09 (diff) | |
| download | nova-87dcb13117459da0e92b98feadab8a4ecba2c4f9.tar.gz nova-87dcb13117459da0e92b98feadab8a4ecba2c4f9.tar.xz nova-87dcb13117459da0e92b98feadab8a4ecba2c4f9.zip | |
Merge "Fix regression with nova-manage floating list"
| -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 e02d6eeaa..1bd0691f4 100755 --- a/bin/nova-manage +++ b/bin/nova-manage @@ -411,7 +411,7 @@ class FloatingIpCommands(object): print _("No floating IP addresses have been defined.") return for floating_ip in floating_ips: - instance_id = None + instance_uuid = None if floating_ip['fixed_ip_id']: fixed_ip = db.fixed_ip_get(ctxt, floating_ip['fixed_ip_id']) instance_uuid = fixed_ip['instance_uuid'] |