diff options
| author | Cory Wright <cory.wright@rackspace.com> | 2011-04-19 20:10:57 +0000 |
|---|---|---|
| committer | Cory Wright <cory.wright@rackspace.com> | 2011-04-19 20:10:57 +0000 |
| commit | 4e11c04a34b3237853c0b4be90ce6362237bcbe0 (patch) | |
| tree | 339c984987462c9e56246c12081e87a5d0924b44 /plugins | |
| parent | c134d3c9bfb5a9d789776b243b8d6e4283fb3f80 (diff) | |
| download | nova-4e11c04a34b3237853c0b4be90ce6362237bcbe0.tar.gz nova-4e11c04a34b3237853c0b4be90ce6362237bcbe0.tar.xz nova-4e11c04a34b3237853c0b4be90ce6362237bcbe0.zip | |
strip output, str() link local
Diffstat (limited to 'plugins')
| -rw-r--r-- | plugins/xenserver/networking/etc/xensource/scripts/novalib.py | 2 | ||||
| -rwxr-xr-x | plugins/xenserver/networking/etc/xensource/scripts/ovs_configure_vif_flows.py | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/plugins/xenserver/networking/etc/xensource/scripts/novalib.py b/plugins/xenserver/networking/etc/xensource/scripts/novalib.py index 5366c385d..9fc4b2310 100644 --- a/plugins/xenserver/networking/etc/xensource/scripts/novalib.py +++ b/plugins/xenserver/networking/etc/xensource/scripts/novalib.py @@ -29,7 +29,7 @@ def execute_get_output(*command): proc = subprocess.Popen(command, close_fds=True, stdout=subprocess.PIPE, stderr=devnull) devnull.close() - return proc.stdout.read() + return proc.stdout.read().strip() def execute(*command): 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 08d7a3859..d1d646b99 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 @@ -86,7 +86,7 @@ def main(dom_id, command, net_type, only_this_vif=None): for ip6 in data['ip6s']: params.update({'VIF_GLOBAL_IPv6': ip6['ip']}) mac64 = netaddr.EUI(mac).eui64() - params.update({'VIF_LOCAL_IPv6': mac64.ipv6_link_local()}) + params.update({'VIF_LOCAL_IPv6': str(mac64.ipv6_link_local())}) apply_ovs_ipv6_flows(command, bridge, params) |