diff options
| author | Johannes Erdfelt <johannes.erdfelt@rackspace.com> | 2011-05-11 15:12:12 +0000 |
|---|---|---|
| committer | Johannes Erdfelt <johannes.erdfelt@rackspace.com> | 2011-05-11 15:12:12 +0000 |
| commit | 43fa5afac9e5af74e2e3977a5dafd9640d064cf1 (patch) | |
| tree | ac8daf40051e4c97fc3445ad54f9478d423c3bfe /nova/api | |
| parent | 21f18f77e7d729107742fa9157b531ce56f3272a (diff) | |
Abstract out IPv6 address generation to pluggable backends
Diffstat (limited to 'nova/api')
| -rw-r--r-- | nova/api/ec2/cloud.py | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/nova/api/ec2/cloud.py b/nova/api/ec2/cloud.py index 092b80fa2..993c91fe1 100644 --- a/nova/api/ec2/cloud.py +++ b/nova/api/ec2/cloud.py @@ -39,6 +39,7 @@ from nova import log as logging from nova import network from nova import utils from nova import volume +from nova import ipv6 from nova.api.ec2 import ec2utils from nova.compute import instance_types from nova.image import s3 @@ -718,7 +719,7 @@ class CloudController(object): fixed = instance['fixed_ip'] floating_addr = fixed['floating_ips'][0]['address'] if instance['fixed_ip']['network'] and 'use_v6' in kwargs: - i['dnsNameV6'] = utils.to_global_ipv6( + i['dnsNameV6'] = ipv6.to_global( instance['fixed_ip']['network']['cidr_v6'], instance['mac_address']) |