Merge lp:~bladernr/maas-cert-server/mcs-install-curtin_userdata-by-packaging into lp:~hardware-certification/maas-cert-server/trunk

[Jeff Lane ]

Moves the copying of curtin_userdata and preseeds out of maniacs-setup and into packaging via postinst script.

This ensures that upgrading the package will also upgrade these files preventing a nasty situation where users may upgrade MCS repeatedly, but never re-run maniacs-setup and thus end up with stale, broken curtin_userdata files.

It does prompt the user after installation to run maniacs-setup to update.

If users have configured a local mirror, of course, this will break mirror usage until they re-run maniacs-setup --update-preseeds, but that breakage will be a lot more obvious than the breakage that occurs when the preseeds are downrev compared to the rest of the mcs files.

[lp:~bladernr/maas-cert-server/mcs-install-curtin_userdata-by-packaging]

60. By Jeff Lane  on 2016-07-07

A little more detail in the ending message and some cleanup in maniacs-setup

[Rod Smith (rodsmith)]

I've done a simple test upgrade using this version and it seemed to go OK. Based on that and your comment in the bug report that you've tested it more extensively yourself, I'll approve this. That said, I think that this change interacts with others we've been considering, so we may end up making further changes in the not-too-distant future. I'll comment more in the bug report....

review: Approve

=== modified file 'debian/changelog'
--- debian/changelog	2016-06-29 15:17:40 +0000
+++ debian/changelog	2016-07-07 04:02:40 +0000
@@ -1,3 +1,11 @@
+maas-cert-server (0.2.22-0ppa1) trusty; urgency=medium
+
+  * Add new postinst script to handle the installation of 
+    curtin_userdata and preseed files.
+  * Removed corresponding code from maniacs-setup
+
+ -- Jeff Lane <[e-mail]>  Wed, 06 Jul 2016 23:48:36 -0400
+
 maas-cert-server (0.2.20-0ppa1) trusty; urgency=medium
 
   * Modify the preseeds to have them update dmidecode
 
=== added file 'debian/postinst'
--- debian/postinst	1970-01-01 00:00:00 +0000
+++ debian/postinst	2016-07-07 04:02:40 +0000
@@ -0,0 +1,49 @@
+#! /bin/sh -e
+
+# Postinstall scritpt for maas-cert-server
+
+timestamp=`date +%Y%m%d_%H%M%S`
+
+# lets install custom curtin_userdata and preseeds during package installation
+# so that updated packages always provide the latest versions automatically.
+if [ ! -f /etc/maas/preseeds/generic-orig ] && [ -f /etc/maas/preseeds/generic ] ; then
+    cp /etc/maas/preseeds/generic /etc/maas/preseeds/generic-orig
+fi
+if [ -f /etc/maas/preseeds/generic-orig ] && [ -f /etc/maas/preseeds/generic ] ; then
+    cp /etc/maas/preseeds/generic /etc/maas/preseeds/generic-$timestamp
+fi
+cp /usr/share/maas-cert-server/preseed/stable-preseed-generic /etc/maas/preseeds/generic
+
+if [ ! -f /etc/maas/preseeds/curtin_userdata-orig ] ; then
+    cp /etc/maas/preseeds/curtin_userdata /etc/maas/preseeds/curtin_userdata-orig
+fi
+if [ -f /etc/maas/preseeds/curtin_userdata-orig ] ; then
+    cp /etc/maas/preseeds/curtin_userdata /etc/maas/preseeds/curtin_userdata-$timestamp
+fi
+cp /usr/share/maas-cert-server/preseed/curtin_userdata_cert /etc/maas/preseeds/curtin_userdata
+
+if [ ! -f /etc/maas/preseeds/curtin_userdata_custom-orig ] ; then
+    cp /etc/maas/preseeds/curtin_userdata_custom /etc/maas/preseeds/curtin_userdata_custom-orig
+fi
+if [ -f /etc/maas/preseeds/curtin_userdata_custom-orig ] ; then
+    cp /etc/maas/preseeds/curtin_userdata_custom /etc/maas/preseeds/curtin_userdata_custom-$timestamp
+fi
+cp /usr/share/maas-cert-server/preseed/curtin_userdata_custom_cert /etc/maas/preseeds/curtin_userdata_custom
+
+
+echo "***********************************************************************"
+echo
+echo " Installation complete.  Now run /usr/sbin/maniacs-setup if necessary"
+echo " to complete or update the configuration of your new Certification"
+echo " MAAS Server."
+echo " NOTE: If you have previously configured a local apt mirror, you will"
+echo " need to run 'sudo maniacs-setup --update-preseeds' to ensure your"
+echo " nodes will be deployed with the correct archive data."
+echo
+echo " Usage: /usr/sbin/maniacs-setup [ --download-virtualization-image ]"
+echo "                  [ --import-boot-resources ] [ --mirror-archives ]"
+echo "                  [ --update-point-releases ] [ --update-preseeds ]"
+echo 
+echo "***********************************************************************"
+
+
 
=== modified file 'usr/sbin/maniacs-setup'
--- usr/sbin/maniacs-setup	2016-05-05 20:19:02 +0000
+++ usr/sbin/maniacs-setup	2016-07-07 04:02:40 +0000
@@ -751,18 +751,6 @@
     echo "***************************************************************************"
     echo "* Setting up certification preseed files...."
     echo "*"
-    if [ ! -f /etc/maas/preseeds/generic-orig ] && [ -f /etc/maas/preseeds/generic ] ; then
-        cp /etc/maas/preseeds/generic /etc/maas/preseeds/generic-orig
-    fi
-    cp /usr/share/maas-cert-server/preseed/stable-preseed-generic /etc/maas/preseeds/generic
-    if [ ! -f /etc/maas/preseeds/curtin_userdata-orig ] ; then
-        cp /etc/maas/preseeds/curtin_userdata /etc/maas/preseeds/curtin_userdata-orig
-    fi
-    cp /usr/share/maas-cert-server/preseed/curtin_userdata_cert /etc/maas/preseeds/curtin_userdata
-    if [ ! -f /etc/maas/preseeds/curtin_userdata_custom-orig ] ; then
-        cp /etc/maas/preseeds/curtin_userdata_custom /etc/maas/preseeds/curtin_userdata_custom-orig
-    fi
-    cp /usr/share/maas-cert-server/preseed/curtin_userdata_custom_cert /etc/maas/preseeds/curtin_userdata_custom
     if [ $MIRRORED -eq 1 ] ; then
         sed -i s/ppa.launchpad.net/$INTERNAL_IP/g /etc/maas/preseeds/generic
         sed -i s/ppa.launchpad.net/$INTERNAL_IP/g /etc/maas/preseeds/curtin_userdata