Merge lp:~rodsmith/maas-cert-server/fix-deployment-failures into lp:~hardware-certification/maas-cert-server/trunk

[Rod Smith]

Improve the preseed files' handling of /etc/network/interfaces by having them set the "auto" bringup option for a given interface if and only if the interface can be brought up via dhclient during deployment. If an interface exists but cannot be brought up in this way, its entry is created, but the "auto" option is commented out and a comment advising that cabling be checked is added. This should improve deployment reliability when only some NICs are cabled.

[Jeff Lane  (bladernr)]

Thanks,

review: Approve

=== modified file 'debian/changelog'
--- debian/changelog	2016-04-06 14:18:09 +0000
+++ debian/changelog	2016-04-20 02:02:59 +0000
@@ -1,9 +1,12 @@
-maas-cert-server (0.2.16-0ppa1) UNRELEASED; urgency=medium
+maas-cert-server (0.2.16-0ppa1) trusty; urgency=medium
+
+  * Fix preseeds so that they produce fewer deployment failures if one
+    or more network ports are unplugged at time of deployment.
 
   * Fix maniacs-setup to support a user home directory named other than
     after the username
 
- -- Rod Smith <[e-mail]>  Wed, 06 Apr 2016 10:15:32 -0400
+ -- Rod Smith <[e-mail]>  Tue, 19 Apr 2016 14:29:07 -0400
 
 maas-cert-server (0.2.15-0ppa1) trusty; urgency=medium
 
 
=== modified file 'preseed/curtin_userdata_cert'
--- preseed/curtin_userdata_cert	2016-03-25 19:17:12 +0000
+++ preseed/curtin_userdata_cert	2016-04-20 02:02:59 +0000
@@ -84,10 +84,18 @@
       echo "# This file created by maas-cert-server curtin preseed script" > /etc/network/interfaces;
       echo "auto lo" >> /etc/network/interfaces;
       echo "iface lo inet loopback\n" >> /etc/network/interfaces;
-      echo "auto" >> /etc/network/interfaces;
-      for i in `ls /sys/class/net|sort |grep -v -E '(lo|wlan)'`; do 
-        /bin/sed -i "/^[ \t]*auto lo.*/! { /^auto/ s/$/ $i/ }" /etc/network/interfaces ;
-        echo "iface $i inet dhcp" >> /etc/network/interfaces ;
+      for i in `ls /sys/class/net|sort |grep -v -E '(lo|wlan)'`; do
+        if [ `cat /sys/class/net/$i/operstate` != "up" ] ; then
+          dhclient -nw $i ;
+          sleep 15 ;
+          if [ `cat /sys/class/net/$i/operstate` != "up" ] ; then
+            echo "# $i available but inoperative; check its cabling and DHCP server!" >> /etc/network/interfaces ;
+            echo -n "#" >> /etc/network/interfaces ;
+          fi;
+          dhclient -r $i ;
+        fi;
+        echo "auto $i" >> /etc/network/interfaces ;
+        echo "iface $i inet dhcp\n" >> /etc/network/interfaces ;
       done;
       echo "Done.";
 
 
=== modified file 'preseed/curtin_userdata_ocp'
--- preseed/curtin_userdata_ocp	2016-03-21 16:58:29 +0000
+++ preseed/curtin_userdata_ocp	2016-04-20 02:02:59 +0000
@@ -71,10 +71,18 @@
       echo "# This file created by maas-cert-server curtin preseed script" > /etc/network/interfaces
       echo "auto lo" >> /etc/network/interfaces;
       echo "iface lo inet loopback\n" >> /etc/network/interfaces;
-      echo "auto" >> /etc/network/interfaces;
-      for i in `ls /sys/class/net|sort |grep -v -E '(lo|wlan)'`; do 
-        /bin/sed -i "/^[ \t]*auto lo.*/! { /^auto/ s/$/ $i/ }" /etc/network/interfaces
-        echo "iface $i inet dhcp" >> /etc/network/interfaces ;
+      for i in `ls /sys/class/net|sort |grep -v -E '(lo|wlan)'`; do
+        if [ `cat /sys/class/net/$i/operstate` != "up" ] ; then
+          dhclient -nw $i ;
+          sleep 15 ;
+          if [ `cat /sys/class/net/$i/operstate` != "up" ] ; then
+            echo "# $i available but inoperative; check its cabling and DHCP server!" >> /etc/network/interfaces ;
+            echo -n "#" >> /etc/network/interfaces ;
+          fi;
+          dhclient -r $i ;
+        fi;
+        echo "auto $i" >> /etc/network/interfaces ;
+        echo "iface $i inet dhcp\n" >> /etc/network/interfaces ;
       done;
       echo "Done.";