git://git.onelab.eu
/
bootmanager.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Rework NAT support.
[bootmanager.git]
/
source
/
steps
/
ReadNodeConfiguration.py
diff --git
a/source/steps/ReadNodeConfiguration.py
b/source/steps/ReadNodeConfiguration.py
index
ec01d64
..
9c9f0df
100644
(file)
--- a/
source/steps/ReadNodeConfiguration.py
+++ b/
source/steps/ReadNodeConfiguration.py
@@
-18,7
+18,6
@@
import BootServerRequest
import BootAPI
import notify_messages
import UpdateRunLevelWithPLC
import BootAPI
import notify_messages
import UpdateRunLevelWithPLC
-import ModelOptions
# two possible names of the configuration files
# two possible names of the configuration files
@@
-601,7
+600,7
@@
def __parse_configuration_file( vars, log, file_contents ):
vars["INTERFACE_SETTINGS"]= INTERFACE_SETTINGS
if (not hostname_resolve_ok and not vars['DISCONNECTED_OPERATION'] and
vars["INTERFACE_SETTINGS"]= INTERFACE_SETTINGS
if (not hostname_resolve_ok and not vars['DISCONNECTED_OPERATION'] and
-
(vars['NODE_MODEL_OPTIONS'] & ModelOptions.NAT) == 0
):
+
'NAT_MODE' not in vars
):
log.write( "Hostname does not resolve correctly, will not continue.\n" )
if can_make_api_call:
log.write( "Hostname does not resolve correctly, will not continue.\n" )
if can_make_api_call: