Rework NAT support.

diff --git a/source/ModelOptions.py b/source/ModelOptions.py
index 7c3d08a..8c8e979 100644 (file)
--- a/source/ModelOptions.py
+++ b/source/ModelOptions.py
@@ -19,7 +19,6 @@ GEODE   = 0x040
 BADHD   = 0x080
 LAST    = 0x100
 RAWDISK = 0x200
-NAT     = 0x400
 
 modeloptions = {'smp':SMP,
                 'x64':X86_64,
@@ -31,8 +30,7 @@ modeloptions = {'smp':SMP,
                 'geode':GEODE,
                 'badhd':BADHD,
                 'minhw':MINHW,
-                'rawdisk':RAWDISK,
-                'nat':NAT}
+                'rawdisk':RAWDISK}
 
 def Get(model):
     modelinfo = string.split(model,'/')

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 ModelOptions
 
 
 # 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['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: