diff options
| author | Chris Behrens <cbehrens@codestud.com> | 2011-09-29 12:54:48 -0700 |
|---|---|---|
| committer | Chris Behrens <cbehrens@codestud.com> | 2011-09-29 12:56:54 -0700 |
| commit | eff0a63758ad59d62045bf913423cdd0c440fa28 (patch) | |
| tree | 32af54a41348385b90320f299dbb6b5703cdf33f | |
| parent | 070e60d21776ea2b32ac557a0661d2025ef111d8 (diff) | |
Fixes bug 862658 -- ec2 metadata issue getting IPs
Was looping through a tuple of (ipv4s, ipv6s) vs just ipv4s list.. to get floating IPs.
Change-Id: Ie743012b7074ecb8b9bc6f018968e21e2f6d405d
| -rw-r--r-- | nova/api/ec2/cloud.py | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/nova/api/ec2/cloud.py b/nova/api/ec2/cloud.py index a6a10c767..759259519 100644 --- a/nova/api/ec2/cloud.py +++ b/nova/api/ec2/cloud.py @@ -271,7 +271,8 @@ class CloudController(object): """Return all floating IPs for an instance""" ret_floaters = [] - fixed_ips = self._get_fixed_ips_for_instance(context, instance) + # only loop through ipv4 addresses + fixed_ips = self._get_fixed_ips_for_instance(context, instance)[0] for ip in fixed_ips: floaters = self._get_floaters_for_fixed_ip(context, ip) # Allows a short circuit if we just need any floater. @@ -287,6 +288,7 @@ class CloudController(object): search_opts = {'project_id': project_id} for instance in self.compute_api.get_all(context, search_opts=search_opts): + # only look at ipv4 addresses fixed_ips = self._get_fixed_ips_for_instance(context, instance)[0] if fixed_ips: line = '%s slots=%d' % (fixed_ips[0], instance['vcpus']) |