Merge lp:~rodsmith/maas-cert-server/autoconfig-virt-images into lp:~hardware-certification/maas-cert-server/trunk

[Rod Smith]

This merge adds automatic configuration of virtualization images to /etc/xdg/canonical-certification.conf via MAAS curtin userdata files. Specifically:

- The node uses wget to see what images are available in the gateway's
  (assumed to be MAAS server's, as in other curtin userdata functions)
  web server's /cloud directory.
- If one or more images with a filename of the form
  ".*$DISTRIB_CODENAME-server-cloudimg-$arch.*img" exists, the first of
  these is set in the conf file.
- If such an image does not exist, but image(s) of the form
  ".*server-cloudimg-$arch.*img" exists, the last of these is set in
  the conf file. (Presumably the last one will be the most recent
  Ubuntu version.)

[Jeff Lane  (bladernr)]

+1

review: Approve

=== modified file 'debian/changelog'
--- debian/changelog	2016-12-08 11:03:51 +0000
+++ debian/changelog	2016-12-09 09:45:43 +0000
@@ -1,8 +1,11 @@
-maas-cert-server (0.2.28-0ppa1) UNRELEASED; urgency=medium
+maas-cert-server (0.2.28-0ppa1) xenial; urgency=medium
 
+  * Add feature to curtin preseed scripts to find KVM images on MAAS
+    server and set /etc/xdg/canonical-certification.conf to refer to
+    the best found image, if possible.
   * Minor changes to maniacs-setup to improve prompt formatting.
 
- -- Rod Smith <[e-mail]>  Thu, 08 Dec 2016 11:56:45 +0100
+ -- Rod Smith <[e-mail]>  Fri, 09 Dec 2016 10:14:21 +0100
 
 maas-cert-server (0.2.27-0ppa1) xenial; urgency=medium
 

=== modified file 'preseed/curtin_userdata_cert'
--- preseed/curtin_userdata_cert	2016-11-18 16:35:19 +0000
+++ preseed/curtin_userdata_cert	2016-12-09 09:45:43 +0000
@@ -66,6 +66,27 @@
       sleep 60;
       echo "Done.";
 
+  - &kvm_image |
+      #!/bin/sh
+      echo "Setting up to use KVM image on MAAS server...";
+      . /etc/lsb-release;
+      arch=$(dpkg --print-architecture);
+      maas_ip=$(/sbin/ip route | awk '/default/ { print $3 }');
+      rm -rf /tmp/index.html;
+      wget -P /tmp/ http://$maas_ip/cloud/;
+      filename_line=$(egrep "$DISTRIB_CODENAME-server-cloudimg-$arch.*img" /tmp/index.html | head -n 1);
+      if [ ! -z "$filename_line" ] ; then
+          filename=$(echo $filename_line | grep -Po '(?<=href=")[^"]*(?=")');
+      else
+          filename_line=$(egrep "server-cloudimg-$arch.*img" /tmp/index.html | head -n 1);
+          filename=$(echo $filename_line | grep -Po '(?<=href=")[^"]*(?=")');
+      fi
+      if [ ! -z "$filename" ] ; then
+          sed -i "s/#KVM_TIMEOUT/KVM_TIMEOUT/g" /etc/xdg/canonical-certification.conf;
+          sed -i "s/#KVM_IMAGE = \/path\/to\/cloudimage-filename.img/KVM_IMAGE = http:\/\/$maas_ip\/cloud\/$filename/g" /etc/xdg/canonical-certification.conf;
+      fi;
+      rm -f /tmp/index.html;
+
   - &iperf
       #!/bin/sh
       echo "Setting up iperf...";
@@ -114,9 +135,10 @@
   # inject maas version into /etc/installed-with-maas and install cert tools
   set_maas_version: ["curtin", "in-target", "--", "sh", "-c", "/bin/echo {{maas_version}} > /etc/installed-by-maas"]
   # Install certification suite
-  zu_cert_install:  ['curtin', 'in-target', '--', 'sh', '-c', *disableupdates ]
-  zv_cert_install:  ['curtin', 'in-target', '--', 'sh', '-c', *sudoers ]
-  zw_cert_install:  ['curtin', 'in-target', '--', 'sh', '-c', *installcert ]
+  zt_cert_install:  ['curtin', 'in-target', '--', 'sh', '-c', *disableupdates ]
+  zu_cert_install:  ['curtin', 'in-target', '--', 'sh', '-c', *sudoers ]
+  zv_cert_install:  ['curtin', 'in-target', '--', 'sh', '-c', *installcert ]
+  zw_cert_install:  ['curtin', 'in-target', '--', 'sh', '-c', *kvm_image ]
   zx_cert_install:  ['curtin', 'in-target', '--', 'sh', '-c', *iperf ]
   zy_cert_install:  ['curtin', 'in-target', '--', 'sh', '-c', *setubuntupass]
   zz_cert_install:  ['curtin', 'in-target', '--', 'sh', '-c', *secureid]

=== modified file 'preseed/curtin_userdata_custom_cert'
--- preseed/curtin_userdata_custom_cert	2016-11-18 16:35:19 +0000
+++ preseed/curtin_userdata_custom_cert	2016-12-09 09:45:43 +0000
@@ -66,6 +66,27 @@
       sleep 60;
       echo "Done.";
 
+  - &kvm_image |
+      #!/bin/sh
+      echo "Setting up to use KVM image on MAAS server...";
+      . /etc/lsb-release;
+      arch=$(dpkg --print-architecture);
+      maas_ip=$(/sbin/ip route | awk '/default/ { print $3 }');
+      rm -rf /tmp/index.html;
+      wget -P /tmp/ http://$maas_ip/cloud/;
+      filename_line=$(egrep "$DISTRIB_CODENAME-server-cloudimg-$arch.*img" /tmp/index.html | head -n 1);
+      if [ ! -z "$filename_line" ] ; then
+          filename=$(echo $filename_line | grep -Po '(?<=href=")[^"]*(?=")');
+      else
+          filename_line=$(egrep "server-cloudimg-$arch.*img" /tmp/index.html | tail -n 1);
+          filename=$(echo $filename_line | grep -Po '(?<=href=")[^"]*(?=")');
+      fi
+      if [ ! -z "$filename" ] ; then
+          sed -i "s/#KVM_TIMEOUT/KVM_TIMEOUT/g" /etc/xdg/canonical-certification.conf;
+          sed -i "s/#KVM_IMAGE = \/path\/to\/cloudimage-filename.img/KVM_IMAGE = http:\/\/$maas_ip\/cloud\/$filename/g" /etc/xdg/canonical-certification.conf;
+      fi;
+      rm -f /tmp/index.html;
+
   - &iperf
       #!/bin/sh
       echo "Setting up iperf...";
@@ -136,9 +157,10 @@
   # inject maas version into /etc/installed-with-maas and install cert tools
   set_maas_version: ["curtin", "in-target", "--", "sh", "-c", "/bin/echo {{maas_version}} > /etc/installed-by-maas"]
   # Install certification suite
-  zt_cert_install:  ['curtin', 'in-target', '--', 'sh', '-c', *disableupdates ]
-  zu_cert_install:  ['curtin', 'in-target', '--', 'sh', '-c', *sudoers ]
-  zv_cert_install:  ['curtin', 'in-target', '--', 'sh', '-c', *installcert ]
+  zs_cert_install:  ['curtin', 'in-target', '--', 'sh', '-c', *disableupdates ]
+  zt_cert_install:  ['curtin', 'in-target', '--', 'sh', '-c', *sudoers ]
+  zu_cert_install:  ['curtin', 'in-target', '--', 'sh', '-c', *installcert ]
+  zv_cert_install:  ['curtin', 'in-target', '--', 'sh', '-c', *kvm_image ]
   zw_cert_install:  ['curtin', 'in-target', '--', 'sh', '-c', *iperf ]
   zx_cert_install:  ['curtin', 'in-target', '--', 'sh', '-c', *networkinterfaces]
   zy_cert_install:  ['curtin', 'in-target', '--', 'sh', '-c', *secureid]