git://git.onelab.eu
/
nodemanager.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge branch 'ipv6'
[nodemanager.git]
/
tools.py
diff --git
a/tools.py
b/tools.py
index
7dc2d1e
..
e88a1b2
100644
(file)
--- a/
tools.py
+++ b/
tools.py
@@
-236,8
+236,8
@@
def get_sliver_process(slice_name, process_cmdline):
path = l.split(':')[0]
comp = l.rsplit(':')[-1]
slice_name_check = comp.rsplit('/')[-1]
path = l.split(':')[0]
comp = l.rsplit(':')[-1]
slice_name_check = comp.rsplit('/')[-1]
- # the lines
above
were added by Guilherme <gsm@machados.org>
- # due to the ipv6 plugin requirements
+ # the lines
below
were added by Guilherme <gsm@machados.org>
+ # due to the ipv6 plugin requirements
(LXC)
virt=get_node_virt()
if virt=='lxc':
slice_name_check = slice_name_check.rsplit('.')[0]
virt=get_node_virt()
if virt=='lxc':
slice_name_check = slice_name_check.rsplit('.')[0]