Changeset 206

Timestamp:

12/18/12 12:53:42 (11 years ago)

Author:

bas

Message:

added a new option to skip hostname lookup failures

Location:

trunk

Files:

• Changelog (modified) (1 diff)
• debian/changelog (modified) (1 diff)
• pxeconfig.spec (modified) (1 diff)
• setup.py (modified) (1 diff)
• src/pxeconfig.py (modified) (5 diffs)
• src/pxeconfigd.py (modified) (2 diffs)

trunk/Changelog

@@ +1 @@
+4.2.0
+  * Added a new option for commandline and pxeconfig.conf:
+    - commandline:
+        -H, --skip-hostname-lookup-error When hostname lookup fails, skip it (default: False)
+
+    - pxeconfig.conf
+        skip_hostname_lookup_error: 1
+
+    This is mostly used for cluster when you just want to install all the nodes, but not all
+    racks/blade-chassis are equally filled with nodes.
+    Author: Bas van der Vlies
+
 4.1.0:
   * Added two new configuration options for pxeconfig.conf file: closes #17 

trunk/debian/changelog

@@ +1 @@
+pxeconfig (4.2.0-1) stable; urgency=low
+
+  * See Changelog
+
+ -- Bas van der Vlies <basv@sara.nl>  Tue, 18 Dec 2012 12:45:18 +0100
+
 pxeconfig (4.1.0-1) stable; urgency=low
 

trunk/pxeconfig.spec

@@ -4 +4 @@
 
 Name: pxeconfig
-Version: 4.1.0 
+Version: 4.2.0 
 Release: 1%{?dist}
 License: See LICENSE

trunk/setup.py

@@ -13 +13 @@
 
 setup ( name = 'pxeconfig',
-        version = '3.1.0',
-        description = 'SARA pxeconfig utilities',
-        author = 'Bas van der Vlies',
-        author_email = 'pxeconfig@sara.nl',
-        url = 'https://subtrac.sara.nl/oss/pxeconfig',
+    version = '4.2.0',
+    description = 'SARA pxeconfig utilities',
+    author = 'Bas van der Vlies',
+    author_email = 'pxeconfig@sara.nl',
+    url = 'https://oss.trac.sara.nl/oss/pxeconfig',
 
 
-        extra_path = 'pxeconfig',
-                package_dir = { '' : 'src' }, 
-                py_modules = [ 'pxeconfig', 'pxeconfigd', 'pxe_global', 'AdvancedParser' ], 
+    extra_path = 'pxeconfig',
+    package_dir = { '' : 'src' }, 
+    py_modules = [ 'pxeconfig', 'pxeconfigd', 'pxe_global', 'AdvancedParser' ], 
 )

trunk/src/pxeconfig.py

@@ -74 +74 @@
 START        = 'start'
 END          = 'end'
-VERSION      = '3.1.0'
+VERSION      = '4.2.0'
 
 def select_pxe_configfile():
@@ -233 +233 @@
         SCRIPT_HOOK_ADD = False,
         SCRIPT_HOOK_REMOVE = False,
+        SKIP_HOSTNAME_ERRORS = False,
     )
 
@@ -263 +264 @@
         dest   = 'VERBOSE',
         help   = 'Make the program more verbose (default: False)'
+    )
+
+    p.add_option('-H', '--skip-hostname-lookup-error',
+        action = 'store_true',
+        dest   = 'SKIP_HOSTNAME_LOOKUP_ERROR',
+        help   = 'When hostname lookup fails, skip it (default: False)'
     )
 
@@ -309 +316 @@
 
 
+    if not options.SKIP_HOSTNAME_LOOKUP_ERROR:
+        try:
+            options.SKIP_HOSTNAME_LOOKUP_ERROR = defaults['skip_hostname_lookup_error']
+        except KeyError, detail:
+            pass
+
     ## This will be obsoleted by client_script_hook_add
     #
@@ -343 +356 @@
             mac_2_hex(host, options)
         else:
-            host_2_hex(host, options)
+            try:
+                host_2_hex(host, options)
+            except PxeConfig, detail:
+
+                if options.SKIP_HOSTNAME_LOOKUP_ERROR:
+                    print 'Skipping Hostname lookup failed for: %s' %(host)
+                    continue
+                else:
+                    print detail
+                    sys.exit(1)
 
 def main():

trunk/src/pxeconfigd.py

@@ -26 +26 @@
         config file which tells how the node must boot. This daemon
         enables a client to remove his/here pxe config file. With the
-        next boot it will use the default one.
-
-        command line option:
-          -V/--version 
-            Prints the version number and exits
+        next boot it will use the default one.
+
+        command line option:
+          -V/--version 
+            Prints the version number and exits
           
         Note:
-          This server can ONLY be started from inetd.
+          This server can ONLY be started from inetd/xinetd.
 """
 import time
@@ -59 +59 @@
 
 PXE_CONF_DIR = '/tftpboot/pxelinux.cfg'
-VERSION = '3.1.0'
+VERSION = '4.2.0'
 
 # Give the current time