Changeset 41

Timestamp:

04/15/08 17:49:15 (4 years ago)

Author:

bruno

Message:

Working dploy-add2dhcp with subnet

Location:

devel

Files:

• dploy-dhcp/bin/dploy-add2dhcp (modified) (1 diff)
• dploy-pxe/bin/dploy-add2pxe (modified) (3 diffs)

devel/dploy-dhcp/bin/dploy-add2dhcp

@@ -3 +3 @@
 # $Id$
 # 
-# (c) Bruno Cornec, HP, provided under the GPL v2
+# (c) Bruno Cornec, HP
+# (c) Gallig Renaud, HP
 #
+# Provided under the GPL v2
 
 use strict;
 use File::Copy;
+use Net::Netmask;
+use File::Basename;
+use Pod::Usage;
+use Getopt::Long qw(:config auto_abbrev no_ignore_case);
+use Data::Dumper;
 
-my $dhcp="PBCONF/dhcpd.conf";
-#
-# /etc/dhcpd.conf should include that line:
-# include "/etc/dhcpd.d/dploy.org.conf";
-# as part of the appropriate range
-# does not support multiple ranges yet
-# This is done at install time by the install script
-# Also a dploy account should exist to run that script
-# and be referenced in sudo. Also done by install script
-#
+my $logfile = "/var/log/dploy.err";
+my $dhcpmain = "/etc/dhcpd.conf";
+my $dhcpsub = "";
+my %opts;
+my $mac = "";
+my $ip = "";
+my $gw = "";
+my $dns = "";
+my $pxe = "";
+my $ntp = "";
+my $netmask = "";
+my $iprange = "";
+my $cidr = "";
 
-my $mac=$ARGV[0] || "";
+GetOptions("help|?|h" => \$opts{'h'},
+            "mac|m=s" => \$opts{'mac'},
+        "ip|i=s" => \$opts{'ip'},
+        "netmask|n=s" => \$opts{'mask'},
+        "gw|g=s" => \$opts{'gw'},
+        "dns|d=s" => \$opts{'dns'},
+        "pxe|p=s" => \$opts{'pxe'},
+        "time|t=s" => \$opts{'ntp'},
+    ) || pb_syntax(-1,0);
 
-if ($mac !~ /^(?:[[:xdigit:]]{1,2}[-:]){5}[[:xdigit:]]{1,2}$/) {
+# Mac address check
+if (defined $opts{'mac'}) {
+  $mac = $opts{'mac'};
+  if ($mac !~ /^(?:[[:xdigit:]]{1,2}[-:]){5}[[:xdigit:]]{1,2}$/) {
     print "Syntax: dploy-add2dhcp MAC ip\n";
     exit(-1);
+  }
+}
+# only lowercase for homogeneity in mac address
+$mac =~ tr/A-Z/a-z/;
+
+# newmac replaces : separator with - and only lowercase for dhcpd
+my $newmac = $mac;
+$newmac =~ s/:/-/g;
+
+# IP address check
+if (defined $opts{'ip'}) {
+  $ip = $opts{'ip'};
+  if ($ip !~ /^([1-9]?\d|1\d\d|2[0-4]\d|25[0-5])\.([1-9]?\d|1\d\d|2[0-4]\d|25[0-5])\.([1-9]?\d|1\d\d|2[0-4]\d|25[0-5])\.([1-9]?\d|1\d\d|2[0-4]\d|25[0-5])$/) {
+    print "Syntax: dploy-add2dhcp mac IP\n";
+    exit(-1);
+  }
 }
 
-# only lowercase for homogeneity
-$mac =~ tr/A-Z/a-z/;
-
-my $ip=$ARGV[1] || "";
-
-if ($ip !~ /^([1-9]?\d|1\d\d|2[0-4]\d|25[0-5])\.([1-9]?\d|1\d\d|2[0-4]\d|25[0-5])\.([1-9]?\d|1\d\d|2[0-4]\d|25[0-5])\.([1-9]?\d|1\d\d|2[0-4]\d|25[0-5])$/) {
-    print "Syntax: dploy-add2dhcp mac IP\n";
-    exit(-1);
+# Other Parameters
+if (defined $opts{'h'}) {
+  pb_syntax(0,1);
 }
-#
-# Reads existing DHCP conf if any
-#
-
-my $foundit = 0;
-
-open(DHCPNEW,"> $dhcp.new") || die "Unable to create $dhcp.new";
-if (open(DHCP,$dhcp)) {
-    while (<DHCP>) {
-        if (/host host-$mac \{/ .. /}\n/) {
-            # We need to replace the old content with the new one
-            print "Skip $_";
-            $foundit = 1;
-        } else {
-            print "Keep $_";
-            # Just write the existing content
-            print DHCPNEW $_;
-        }
-    }
-    close(DHCP);
-} else {
-    $foundit = 1;
+if (defined $opts{'mask'}) {
+  $netmask = $opts{'mask'};
+}
+if (defined $opts{'gw'}) {
+  $gw = $opts{'gw'};
+}
+if (defined $opts{'pxe'}) {
+  $pxe = $opts{'pxe'};
 }
 
-if ($foundit == 1) {
-    # Writes new DHCP conf from scratch
-    #
-    print DHCPNEW "\n";
-    print DHCPNEW "host host-$mac {\n";
-    print DHCPNEW " hardware ethernet $mac;\n";
-    print DHCPNEW " fixed-address $ip;\n";
-    print DHCPNEW "}\n\n";
+# Calculate IP subnet
+my  $block = new Net::Netmask ($ip, $netmask);
+$iprange = $block->base();
+$cidr = $block->bits(); 
+
+# Check if a DHCP conf file already exist for the subnet
+$dhcpsub="/etc/dploy/dhcp-$iprange-$cidr.conf";
+if (! -d "/etc/dploy" ) {
+  mkdir ("/etc/dploy",0755);
 }
-close(DHCPNEW);
-move("$dhcp.new",$dhcp);
 
-#
+if (! -e "$dhcpsub" ) {
+  # Create a DHCP file for the IP subnet
+  open(DHCPSUBNEW,"> $dhcpsub.new") || die "Unable to create $dhcpsub.new: $!";
+    print DHCPSUBNEW "subnet $iprange netmask $netmask {\n";
+    print DHCPSUBNEW "  option routers              $gw;\n";
+    if (defined $opts{'dns'}) {
+      $dns = $opts{'dns'};
+      print DHCPSUBNEW "  option domain-name-servers  $dns;\n";
+    }
+    if (defined $opts{'ntp'}) {
+      $ntp = $opts{'ntp'};
+      print DHCPSUBNEW "  option ntp-servers          $ntp;\n";
+    }
+    print DHCPSUBNEW "  next-server                 $pxe;\n";
+    print DHCPSUBNEW "  authoritative;\n";
+    print DHCPSUBNEW "  if substring(option vendor-class-identifier, 0, 20) = \"PXEClient:Arch:00000\" {\n";
+    print DHCPSUBNEW "    filename \"pxelinux.bin\";\n";
+    print DHCPSUBNEW "  } else if substring(option vendor-class-identifier, 0, 20) = \"PXEClient:Arch:00002\" {\n";
+    print DHCPSUBNEW "    filename \"elilo-ia64.efi\";\n";
+    print DHCPSUBNEW "  }\n";
+    print DHCPSUBNEW "}\n";
+  close DHCPSUBNEW;
+  move("$dhcpsub.new",$dhcpsub);
+}
+
+# Update the main DHCP configuration file
+my $foundit = 0;
+open(DHCPMAIN, "$dhcpmain") || die "Unable to open $dhcpmain: $!";
+while (<DHCPMAIN>) {
+    if (/include\s+\"$dhcpsub\";/) {
+        $foundit=1;
+    }
+}
+close(DHCPMAIN);
+
+if ($foundit == 0) {
+    open(DHCPMAIN, ">>$dhcpmain") || die "Unable to open $dhcpmain: $!";
+    print DHCPMAIN "include \"$dhcpsub\";\n";
+    close(DHCPMAIN);
+}
+
+
+# Populate the subnet DHCP file with the new server entry
+# Replace server entry if already existing
+$foundit = 0;
+# let's try to find the right position in the file
+my $bracket = 0;
+my $bracketfound = 0;
+my $lastline = "";
+
+open(DHCPSUBNEW,"> $dhcpsub.new") || die "Unable to create $dhcpsub.new: $!";
+open(DHCPSUB, "$dhcpsub") || die "Why can't I open a file I just created: $!";
+while (<DHCPSUB>) {
+    if (/{/) {
+        $bracket++;
+        $bracketfound=1;
+    }
+    if (/}/) {
+        $bracket--;
+    }
+    if (/host host-$newmac {/ .. /}\n/) {
+        # We need to replace the old content with the new one
+        print "Skip $_";
+        $foundit = 1;
+    } else {
+        print "Keep $_";
+        # Just write the existing content
+        print DHCPSUBNEW $_  unless (($_ =~ /}/) && ($bracket == 0) && ($bracketfound == 1));
+    }
+    $lastline = $_;
+}
+
+print DHCPSUBNEW "  host host-$newmac {\n";
+print DHCPSUBNEW "  hardware ethernet $mac;\n";
+print DHCPSUBNEW "  fixed-address $ip;\n";
+print DHCPSUBNEW "  }\n";
+print DHCPSUBNEW $lastline;
+
+close DHCPSUBNEW;
+close DHCPSUB;
+move("$dhcpsub.new",$dhcpsub);
+
 # Relaunch DHCP server
-#
 system("sudo /etc/init.d/dhcpd restart");

devel/dploy-pxe/bin/dploy-add2pxe

@@ -3 +3 @@
 use strict;
 use File::Copy;
+use File::Basename;
 
-my $dhcp="/etc/dhcpd.d/dploy.org.conf";
-#
-# /etc/dhcpd.conf should include that line:
-# include "/etc/dhcpd.d/dploy.org.conf";
-# as part of the appropriate range
-# does not support multiple ranges yet
-#
+# Root of the PXE setup
 my $pxe="/tftpboot/pxelinux.cfg";
-# Where to find the LinuxCOE created ISO
+# Where to find the LinuxCOE created ISO on the SystemDesigner server
 my $linuxcoe="/var/ftp/html/scratch_monkey/systemdesigner";
+# Where to find the Mondorescue created ISO on the Images server
+my $mondorescue="/var/ftp/html/mondorescue/iso";
 # temporary mountpoint
-my $mnt="/tmp/mnt-linuxcoe";
+my $mnt="/tmp/mnt-dploy";
 
-my $mac=$ARGV[0];
+my $mac=$ARGV[0] || "";
 
 if ($mac !~ /^(?:[[:xdigit:]]{1,2}[-:]){5}[[:xdigit:]]{1,2}$/) {
-    print "Syntax: add2pxe MAC ip url-to-LinuxCOE-iso\n";
-    exit(-1);
+        print "Syntax: dploy-add2pxe MAC url-to-iso\n";
+        exit(-1);
 }
 
-my $ip=$ARGV[1];
-
-if ($ip !~ /^([1-9]?\d|1\d\d|2[0-4]\d|25[0-5])\.([1-9]?\d|1\d\d|2[0-4]\d|25[0-5])\.([1-9]?\d|1\d\d|2[0-4]\d|25[0-5])\.([1-9]?\d|1\d\d|2[0-4]\d|25[0-5])$/) {
-    print "Syntax: add2pxe mac IP url-to-LinuxCOE-iso\n";
-    exit(-1);
-}
-
-my $url=$ARGV[2];
-
-if ($url !~ /(\w+):\/\/([^\/:]+)(:\d+)?\/(.*)/) {
-    print "Syntax: add2pxe mac ip URL-TO-LinuxCOE-ISO\n";
-    exit(-1);
-}
-
-# Reads existing DHCP conf if any
-#
+# only lowercase for homogeneity
+$mac =~ tr/A-Z/a-z/;
 
 # newmac replaces : separator with - and only lowercase for pxelinux
@@ -46 +29 @@
 $newmac =~ s/:/-/g;
 
-my $foundit = 0;
+my $url=$ARGV[1];
 
-open(DHCPNEW,"> $dhcp.new") || die "Unable to create $dhcp.new";
-if (open(DHCP,$dhcp)) {
-    while (<DHCP>) {
-        if (/host host-$newmac \{/ .. /}\n/) {
-            # We need to replace the old content with the new one
-            print "Skip $_";
-            $foundit = 1;
-        } else {
-            print "Keep $_";
-            # Just write the existing content
-            print DHCPNEW $_;
-        }
-    }
-    close(DHCP);
-} else {
-    $foundit = 1;
+if ($url !~ /(\w+):\/\/([^\/:]+)(:\d+)?\/(.*)/) {
+    print "Syntax: dploy-add2pxe mac URL-TO-ISO\n";
+    exit(-1);
 }
 
-if ($foundit == 1) {
-    # Writes new DHCP conf from scratch
-    #
-    print DHCPNEW "\n";
-    print DHCPNEW "host host-$newmac {\n";
-    print DHCPNEW " hardware ethernet $mac;\n";
-    print DHCPNEW " fixed-address $ip;\n";
-    print DHCPNEW "}\n\n";
-}
-close(DHCPNEW);
-move("$dhcp.new",$dhcp);
-
-# Relaunch DHCP server
-system("sudo /etc/init.d/dhcpd restart");
-
-# Get the ID given by LinuxCOE to prepare kernel/initrd/ks
+# Get the ID given by LinuxCOE/MondoRescue to prepare kernel/initrd/ks
 my $iso=basename($url);
 my $id=$iso;
@@ -114 +69 @@
 copy("$mnt/isolinux/initrd.img","$pxe/../linuxcoe/$i") or die "Copy failed: $!";
 system("sudo /bin/umount $mnt");
-
-# Based on Version 2.4  27-Sep-1996  Charles Bailey  bailey@genetics.upenn.edu
-# in Basename.pm
-
-sub basename {
-
-my($fullname) = shift;
-my($dirpath,$basename);
-($dirpath,$basename) = ($fullname =~ m#^(.*/)?(.*)#s);
-
-return($basename);
-}
-