git://git.onelab.eu
/
nodemanager.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
|
inline
| side by side (parent:
4cb098f
)
change name of private IPs from slice_name.hostname to pvt.hostname
author
smbaker
<smbaker@fc8clean.lan>
Sat, 19 Jan 2013 19:23:56 +0000
(11:23 -0800)
committer
smbaker
<smbaker@fc8clean.lan>
Sat, 19 Jan 2013 19:23:56 +0000
(11:23 -0800)
plugins/hostmap.py
patch
|
blob
|
history
diff --git
a/plugins/hostmap.py
b/plugins/hostmap.py
index
d0d8d74
..
6a71ec2
100644
(file)
--- a/
plugins/hostmap.py
+++ b/
plugins/hostmap.py
@@
-52,14
+52,14
@@
def GetSlivers(data, config=None, plc=None):
for index, entry in enumerate(tag["value"].split("\n")):
parts = entry.split(" ")
if len(parts)==2:
for index, entry in enumerate(tag["value"].split("\n")):
parts = entry.split(" ")
if len(parts)==2:
- if parts[1] == hostname:
- line = "127.0.0.1 %s.%s private%d" % (slicename, parts[1], index)
- else:
- line = "%s %s.%s private%d" % (parts[0], slicename, parts[1], index)
+ line = "%s pvt.%s private%d" % (parts[0], parts[1], index)
if (index==0):
line = line + " headnode"
if (index==0):
line = line + " headnode"
+ if parts[1] == hostname:
+ line = line + " pvt.self"
+
hostmap.append(line)
hostmap = "\n".join(hostmap)
hostmap.append(line)
hostmap = "\n".join(hostmap)
@@
-84,4
+84,3
@@
def GetSlivers(data, config=None, plc=None):
logger.log_exc("hostmap (%s): failed to write %s" % (slicename, fn))
logger.log_exc("hostmap (%s): failed to write %s" % (slicename, fn))
-