summaryrefslogtreecommitdiffstats
path: root/nova/api
diff options
context:
space:
mode:
authorTrey Morris <trey.morris@rackspace.com>2011-05-19 10:40:49 -0500
committerTrey Morris <trey.morris@rackspace.com>2011-05-19 10:40:49 -0500
commit08a22883fd5bf58b5b74645d1b2065a0be8c733b (patch)
treea2a73de7c91a2b147ad09a3e504055c214720513 /nova/api
parent07ba43fc30f39f6f5122b1ba539c6a669bb35f34 (diff)
updated the hypervisors and ec2 api to support receiving lists from pluralized mac_addresses and fixed_ips
Diffstat (limited to 'nova/api')
-rw-r--r--nova/api/ec2/cloud.py2
1 files changed, 1 insertions, 1 deletions
diff --git a/nova/api/ec2/cloud.py b/nova/api/ec2/cloud.py
index 0e74089be..42ade8dca 100644
--- a/nova/api/ec2/cloud.py
+++ b/nova/api/ec2/cloud.py
@@ -723,7 +723,7 @@ class CloudController(object):
if instance['fixed_ip']['network'] and 'use_v6' in kwargs:
i['dnsNameV6'] = utils.to_global_ipv6(
instance['fixed_ip']['network']['cidr_v6'],
- instance['mac_address'])
+ instance['fixed_ip']['mac_address']['address'])
i['privateDnsName'] = fixed_addr
i['privateIpAddress'] = fixed_addr