git://git.onelab.eu
/
bootmanager.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
|
inline
| side by side (from parent 1:
438c5fd
)
Use more python native coding convention
author
Marc Fiuczynski
<mef@cs.princeton.edu>
Tue, 4 Nov 2008 21:01:28 +0000
(21:01 +0000)
committer
Marc Fiuczynski
<mef@cs.princeton.edu>
Tue, 4 Nov 2008 21:01:28 +0000
(21:01 +0000)
source/steps/WriteNetworkConfig.py
patch
|
blob
|
history
diff --git
a/source/steps/WriteNetworkConfig.py
b/source/steps/WriteNetworkConfig.py
index
2f8c0f6
..
46ce122
100644
(file)
--- a/
source/steps/WriteNetworkConfig.py
+++ b/
source/steps/WriteNetworkConfig.py
@@
-88,12
+88,8
@@
def Run( vars, log ):
except KeyError, e:
raise BootManagerException, "Missing value %s in interface settings." % str(e)
except KeyError, e:
raise BootManagerException, "Missing value %s in interface settings." % str(e)
- try:
- dns2= ''
- dns2= interface_settings['dns2']
- except KeyError, e:
- pass
-
+ # dns2 is not required to be set
+ dns2 = interface_settings.get('dns2','')
# Node Manager needs at least PLC_API_HOST and PLC_BOOT_HOST
log.write("Writing /etc/planetlab/plc_config\n")
# Node Manager needs at least PLC_API_HOST and PLC_BOOT_HOST
log.write("Writing /etc/planetlab/plc_config\n")
@@
-179,10
+175,7
@@
def Run( vars, log ):
elif interface['method'] == "dhcp":
inter['BOOTPROTO'] = "dhcp"
elif interface['method'] == "dhcp":
inter['BOOTPROTO'] = "dhcp"
- if interface['hostname']:
- inter['DHCP_HOSTNAME'] = interface['hostname']
- else:
- inter['DHCP_HOSTNAME'] = hostname
+ inter['DHCP_HOSTNAME'] = interface.get('hostname',hostname)
if not interface['is_primary']:
inter['DHCLIENTARGS'] = "-R subnet-mask"
if not interface['is_primary']:
inter['DHCLIENTARGS'] = "-R subnet-mask"