Merge lp:~rodsmith/maas-cert-server/fix-i386-detection into lp:~hardware-certification/maas-cert-server/trunk

[Rod Smith]

This is not-quite-a-fix for bug #1641971 (using maniacs-setup fails to import i386 images by default under MAAS 2.1, resulting in error messages). Instead of addressing the issue head-on, this version returns the script to the behavior it had in the past (with MAAS 2.0): It imports i386 custom images if and only if standard MAAS i386 images already exist on the server. The error messages seem to be a result of pxelinux being split out into its own unique image in MAAS 2.1, which was not the case with MAAS 2.0. This results in the need for a more complex test to see if an i386 image is loaded. Note that, because this doesn't precisely address the issues in bug #1641971, I have not marked this as a fix for that bug.

[Jeff Lane  (bladernr)]

Cool.

review: Approve

=== modified file 'debian/changelog'
--- debian/changelog	2016-10-17 17:49:31 +0000
+++ debian/changelog	2016-11-16 22:07:52 +0000
@@ -1,3 +1,10 @@
+maas-cert-server (0.2.26-0ppa1) xenial; urgency=medium
+
+  * Fixed detection of i386 images for custom-image download
+    feature under MAAS 2.1.
+
+ -- Rod Smith <[e-mail]>  Wed, 16 Nov 2016 16:57:33 -0500
+
 maas-cert-server (0.2.25-0ppa1) xenial; urgency=medium
 
   * Fixed typo in prompt in maniacs-setup: "virtualization" was spelled
 
=== modified file 'usr/sbin/maniacs-setup'
--- usr/sbin/maniacs-setup	2016-09-13 18:57:24 +0000
+++ usr/sbin/maniacs-setup	2016-11-16 22:07:52 +0000
@@ -861,6 +861,34 @@
 }
 
 
+# Determine if any i386 images are loaded on the MAAS server.
+# Sets $is_i386 to "N" if no i386 images are found, "Y" if they are.
+is_i386_loaded() {
+    is_i386="N"
+    local resources=`maas admin boot-resources read`
+    # Look for evidence of i386 installation. Note that the below can produce
+    # false positives, so we do more shortly....
+    local maybe_i386=`echo $resources | jshon -a -e architecture | grep i386`
+    if [ ! -z "$maybe_i386" ] ; then
+        local num_entries=`echo $resources | jshon -l`
+        let last_entry=$num_entries-1
+        for entry in `seq 0 $last_entry`; do
+            one_entry=`echo $resources | jshon -e $entry`
+            local found_possible_i386=`echo $one_entry | grep i386`
+            if [ ! -z "$found_possible_i386" ] ; then
+               local is_pxelinux=`echo "$one_entry" | jshon -e name | grep pxelinux`
+               # False positive can result from pxelinux entry, which is why
+               # we filter it out. AFAIK, any other "i386" in "name" field is
+               # a legitimate i386 image.
+               if [ -z "$is_pxelinux" ] ; then
+                   is_i386="Y"
+               fi
+            fi
+        done
+    fi
+} # is_i386_loaded()
+
+
 setup_point_releases() {
     echo
     echo "***************************************************************************"
@@ -872,7 +900,7 @@
         local versions=`wget -O - $FIXED_POINT_URL 2> /dev/null | grep ubuntu.*gz | sed "s/.*ubuntu-//" | sed "s/-server-.*//" | uniq | sort -r`
         local old_series=""
         local default_release=""
-        local is_i386=`maas admin boot-resources read | grep i386`
+        is_i386_loaded
         for release in ${versions[@]}; do
             local series=`echo $release | cut -b 1-5`
             if [ "$old_series" != "$series" ] ; then
@@ -897,7 +925,7 @@
                     default_release=u"$release"_amd64
                 fi
                 load_point_release $release amd64 "$default_yn"
-                if [ ! -z "$is_i386" ] ; then
+                if [ "$is_i386" = "Y" ] ; then
                     load_point_release $release i386 "$default_yn"
                 fi
             fi