diff options
| author | Trey Morris <trey.morris@rackspace.com> | 2011-04-05 18:29:53 -0500 |
|---|---|---|
| committer | Trey Morris <trey.morris@rackspace.com> | 2011-04-05 18:29:53 -0500 |
| commit | a254fd9b63c48f64a62fd38df3a2caae81ce63c7 (patch) | |
| tree | eae81f83bb809669d7476c952cb1c347b8e5b230 | |
| parent | 94ccd2f4a1c42a8574fe65972650428130ae850d (diff) | |
typo
| -rw-r--r-- | nova/virt/xenapi/vmops.py | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/nova/virt/xenapi/vmops.py b/nova/virt/xenapi/vmops.py index c96c35a6e..ef2ab09b9 100644 --- a/nova/virt/xenapi/vmops.py +++ b/nova/virt/xenapi/vmops.py @@ -814,12 +814,11 @@ class VMOps(object): "netmask": network["netmask"], "enabled": "1"} - def ip6_dict(ip6): + def ip6_dict(): return { "ip": utils.to_global_ipv6(network['cidr_v6'], instance['mac_address']), "netmask": network['netmask_v6'], - "gateway": network['gateway_v6'], "enabled": "1"} info = { @@ -831,7 +830,9 @@ class VMOps(object): 'dns': [network['dns']], 'ips': [ip_dict(ip) for ip in network_IPs]} if network['cidr_v6']: - info['ip6s'] = [ip6_dict(ip) for ip in network_IPs] + info['ip6s'] = [ip6_dict()] + if network['gateway_v6']: + info['gateway6'] = network['gateway_v6'], network_info.append((network, info)) return network_info |