git://git.onelab.eu
/
nodemanager-topo.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Restart the veserver if spaces/net changes
[nodemanager-topo.git]
/
topo.py
diff --git
a/topo.py
b/topo.py
index
b2beba5
..
559d417
100755
(executable)
--- a/
topo.py
+++ b/
topo.py
@@
-181,9
+181,10
@@
def update_nat(slice, myid, key, netns):
"""
"""
-Write /etc/vservers/<slicename>/spaces/net. If the vserver is running and the spaces/net file is modified, we need to restart it.
+Write /etc/vservers/<slicename>/spaces/net.
+Restart the vserver if there are any changes.
"""
"""
-def write_
conf_and_restar
t(slicename, value):
+def write_
spaces_ne
t(slicename, value):
SLICEDIR="/etc/vservers/%s/" % slicename
SPACESDIR="%s/spaces/" % SLICEDIR
FILENAME="%s/net" % SPACESDIR
SLICEDIR="/etc/vservers/%s/" % slicename
SPACESDIR="%s/spaces/" % SLICEDIR
FILENAME="%s/net" % SPACESDIR
@@
-197,11
+198,9
@@
def write_conf_and_restart(slicename, value):
if os.path.exists(FILENAME) != value:
sliver = vserver.VServer(slicename)
if os.path.exists(FILENAME) != value:
sliver = vserver.VServer(slicename)
- restart = sliver.is_running()
- if (restart):
- sliver.stop()
-
+ sliver.stop()
+
if value:
STATUS="ON"
f = open(FILENAME, "w")
if value:
STATUS="ON"
f = open(FILENAME, "w")
@@
-209,12
+208,10
@@
def write_conf_and_restart(slicename, value):
else:
STATUS="OFF"
os.remove(FILENAME)
else:
STATUS="OFF"
os.remove(FILENAME)
-
- logger.log("%s: network namespace %s\n" % (slicename, STATUS))
- if (restart):
- logger.log("topo: restarting sliver %s\n" % slicename)
-
sliver.start(
)
+ sliver.start()
+
+
logger.log("%s: network namespace %s\n" % (slicename, STATUS)
)
"""
"""
@@
-333,7
+330,6
@@
def update_quagga_configs(slicename, hostname, myid, topo, key, netns):
quagga_dir = "/vservers/%s/etc/quagga/" % slicename
if not os.path.exists(quagga_dir):
try:
quagga_dir = "/vservers/%s/etc/quagga/" % slicename
if not os.path.exists(quagga_dir):
try:
- # Quagga not installed. Install it here? Chkconfig, sym links.
os.mkdir(quagga_dir)
except os.error:
logger.log("topo: could not create %s\n" % quagga_dir)
os.mkdir(quagga_dir)
except os.error:
logger.log("topo: could not create %s\n" % quagga_dir)
@@
-343,8
+339,6
@@
def update_quagga_configs(slicename, hostname, myid, topo, key, netns):
myid, key)
write_ospf(quagga_dir + "ospfd.conf.generated", hostname, ifaces)
myid, key)
write_ospf(quagga_dir + "ospfd.conf.generated", hostname, ifaces)
- # Start up Quagga if we installed it earlier and netns = 1.
-
return
return
@@
-381,6
+375,7
@@
def write_egre_keys(slicekeys):
Executed on NM startup
"""
def start(options, config):
Executed on NM startup
"""
def start(options, config):
+ # Should be taken care of by /etc/sysctl.conf, but it doesn't hurt...
run ("echo 1 > /proc/sys/net/ipv4/ip_forward")
pass
run ("echo 1 > /proc/sys/net/ipv4/ip_forward")
pass
@@
-410,7
+405,7
@@
def GetSlivers(data, config = None, plc = None):
netns = int(attrs['netns'])
else:
netns = 0
netns = int(attrs['netns'])
else:
netns = 0
- write_
conf_and_restar
t(sliver['name'], netns)
+ write_
spaces_ne
t(sliver['name'], netns)
if vserver.VServer(sliver['name']).is_running():
if 'egre_key' in attrs:
if vserver.VServer(sliver['name']).is_running():
if 'egre_key' in attrs: