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]
/
plugins
/
hostmap.py
diff --git
a/plugins/hostmap.py
b/plugins/hostmap.py
index
6a71ec2
..
8bd1c08
100644
(file)
--- a/
plugins/hostmap.py
+++ b/
plugins/hostmap.py
@@
-38,6
+38,8
@@
def GetSlivers(data, config=None, plc=None):
hostname = data['hostname']
hostname = data['hostname']
+ hostname_filter = ".".join(hostname.split(".")[1:])
+
for sliver in data['slivers']:
slicename = sliver['name']
for tag in sliver['attributes']:
for sliver in data['slivers']:
slicename = sliver['name']
for tag in sliver['attributes']:
@@
-54,6
+56,9
@@
def GetSlivers(data, config=None, plc=None):
if len(parts)==2:
line = "%s pvt.%s private%d" % (parts[0], parts[1], index)
if len(parts)==2:
line = "%s pvt.%s private%d" % (parts[0], parts[1], index)
+ if (parts[0].startswith("10.")) and (hostname_filter not in parts[1]):
+ continue
+
if (index==0):
line = line + " headnode"
if (index==0):
line = line + " headnode"