diff options
| author | Cory Wright <cory.wright@rackspace.com> | 2011-04-19 22:13:40 +0000 |
|---|---|---|
| committer | Cory Wright <cory.wright@rackspace.com> | 2011-04-19 22:13:40 +0000 |
| commit | a46bd9fb6483959e210f25276ff70c76767e509d (patch) | |
| tree | 474233ea122ebfbf9698bb606016fdadec5fad01 /plugins | |
| parent | 4e11c04a34b3237853c0b4be90ce6362237bcbe0 (diff) | |
| download | nova-a46bd9fb6483959e210f25276ff70c76767e509d.tar.gz nova-a46bd9fb6483959e210f25276ff70c76767e509d.tar.xz nova-a46bd9fb6483959e210f25276ff70c76767e509d.zip | |
only apply ipv6 if the data exists in xenstore
Diffstat (limited to 'plugins')
| -rwxr-xr-x | plugins/xenserver/networking/etc/xensource/scripts/ovs_configure_vif_flows.py | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/plugins/xenserver/networking/etc/xensource/scripts/ovs_configure_vif_flows.py b/plugins/xenserver/networking/etc/xensource/scripts/ovs_configure_vif_flows.py index d1d646b99..e1a151476 100755 --- a/plugins/xenserver/networking/etc/xensource/scripts/ovs_configure_vif_flows.py +++ b/plugins/xenserver/networking/etc/xensource/scripts/ovs_configure_vif_flows.py @@ -82,10 +82,10 @@ def main(dom_id, command, net_type, only_this_vif=None): for ip4 in data['ips']: params.update({'VIF_IPv4': ip4['ip']}) apply_ovs_ipv4_flows(command, bridge, params) - if net_type in ('ipv6', 'all'): + if net_type in ('ipv6', 'all') and 'ip6s' in data: for ip6 in data['ip6s']: params.update({'VIF_GLOBAL_IPv6': ip6['ip']}) - mac64 = netaddr.EUI(mac).eui64() + mac64 = netaddr.EUI(data['mac']).eui64() params.update({'VIF_LOCAL_IPv6': str(mac64.ipv6_link_local())}) apply_ovs_ipv6_flows(command, bridge, params) |