git://git.onelab.eu
/
pyplnet.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
|
inline
| side by side (parent:
7e556f4
)
Add the gateway for static networks.
author
Daniel Hokka Zakrisson
<dhokka@cs.princeton.edu>
Fri, 5 Dec 2008 16:25:59 +0000
(16:25 +0000)
committer
Daniel Hokka Zakrisson
<dhokka@cs.princeton.edu>
Fri, 5 Dec 2008 16:25:59 +0000
(16:25 +0000)
plnet.py
patch
|
blob
|
history
diff --git
a/plnet.py
b/plnet.py
index
151cd2f
..
9150a18
100755
(executable)
--- a/
plnet.py
+++ b/
plnet.py
@@
-23,6
+23,7
@@
def InitInterfaces(logger, plc, data, root="", files_only=False, program="NodeMa
interfaces = {}
interface = 1
hostname = data.get('hostname',socket.gethostname())
interfaces = {}
interface = 1
hostname = data.get('hostname',socket.gethostname())
+ gateway = None
networks = data['networks']
failedToGetSettings = False
for network in networks:
networks = data['networks']
failedToGetSettings = False
for network in networks:
@@
-55,6
+56,8
@@
def InitInterfaces(logger, plc, data, root="", files_only=False, program="NodeMa
inter['BOOTPROTO'] = "static"
inter['IPADDR'] = network['ip']
inter['NETMASK'] = network['netmask']
inter['BOOTPROTO'] = "static"
inter['IPADDR'] = network['ip']
inter['NETMASK'] = network['netmask']
+ if network['is_primary']:
+ gateway = network['gateway']
elif network['method'] == "dhcp":
inter['BOOTPROTO'] = "dhcp"
elif network['method'] == "dhcp":
inter['BOOTPROTO'] = "dhcp"
@@
-183,12
+186,19
@@
def InitInterfaces(logger, plc, data, root="", files_only=False, program="NodeMa
if deletedSomething:
time.sleep(2)
if deletedSomething:
time.sleep(2)
- # Process ifcg-$dev changes / additions
+ # Write network configuration file
+ networkconf = file("%s/etc/sysconfig/network", "w")
+ networkconf.write("NETWORKING=yes\nHOSTNAME=%s\n" % hostname)
+ if gateway is not None:
+ networkconf.write("GATEWAY=%s\n" % gateway)
+ networkconf.close()
+
+ # Process ifcfg-$dev changes / additions
newdevs = []
for (dev, inter) in interfaces.iteritems():
(fd, tmpnam) = tempfile.mkstemp(dir=sysconfig)
f = os.fdopen(fd, "w")
newdevs = []
for (dev, inter) in interfaces.iteritems():
(fd, tmpnam) = tempfile.mkstemp(dir=sysconfig)
f = os.fdopen(fd, "w")
- f.write("# Autogenerated by
NodeManager/net.py.
... do not edit!\n")
+ f.write("# Autogenerated by
pyplnet
... do not edit!\n")
if 'DRIVER' in inter:
f.write("# using %s driver for device %s\n" % (inter['DRIVER'],dev))
f.write('DEVICE="%s"\n' % dev)
if 'DRIVER' in inter:
f.write("# using %s driver for device %s\n" % (inter['DRIVER'],dev))
f.write('DEVICE="%s"\n' % dev)