Merge lp:~smoser/maas/cleaner-shutdown into lp:maas/trunk

[Scott Moser]

fix annoying cloud-init warnings caused by shutting down

when /sbin/shutdown is called from a user-data script, it ends up
making upstart kill syslog or even cloud-init itself, and cloud-init
is somewhat annoying about it to the console.

This ensures that cloud-final (the job that runs user-scripts) has
finished before shutting down.

fix annoying cloud-init warnings caused by shutting down

when /sbin/shutdown is called from a user-data script, it ends up
making upstart kill syslog or even cloud-init itself, and cloud-init
is somewhat annoying about it to the console.

This ensures that cloud-final (the job that runs user-scripts) has
finished before shutting down.

[Julian Edwards (julian-edwards)]

Is there any way of factoring the common code in the enlist and commissioning user data? If there's a bug in it (which is hard to tell, since we don't have tests) then it'll be in two places.

16 + echo "$state [$2] after $i"
39 + echo "$state [$2] after $i"

This is a poor message, can you make it something like:
"After $i seconds, cloud-final still in state $2"

and then at the top of the function please add something like
echo "Waiting for cloud-final to shut down."

Also, some capital letters and punctuation would not go amiss (we're sticklers for that in the Launchpad^WCloud Engineering team).

Approved if you ran and tested this.

review: Approve

[Scott Moser (smoser)]

This change removes the polling and the status output.
Reguarding the copied code, I dont like it either.

We can and should re-factor the way user-data is created so that we can re-use the code more effectively. Thats a more invasive change though.

[MAAS Lander (maas-lander)]

No commit message specified.

=== modified file 'contrib/preseeds_v2/enlist_userdata'
--- contrib/preseeds_v2/enlist_userdata	2012-10-10 04:46:36 +0000
+++ contrib/preseeds_v2/enlist_userdata	2012-10-10 14:08:26 +0000
@@ -212,9 +212,23 @@
       sleep 60
       [ -e $bfile ] && exit 0
    fi
-   poweroff
+ - &write_poweroff_job |
+   cat >/etc/init/maas-poweroff.conf <<EOF
+   description "poweroff when maas task is done"
+   start on stopped cloud-final
+   console output
+   task
+   script
+     [ ! -e /tmp/block-poweroff ] || exit 0
+     poweroff
+   end script
+   EOF
+   # reload required due to lack of inotify in overlayfs (LP: #882147)
+   initctl reload-configuration
+
 
 packages: [ maas-enlist, freeipmi-tools ]
 output: {all: '| tee -a /var/log/cloud-init-output.log'}
 runcmd:
  - [ sh, -c, *maas_enlist ]
+ - [ sh, -c, *write_poweroff_job ]

=== modified file 'etc/maas/commissioning-user-data'
--- etc/maas/commissioning-user-data	2012-10-09 18:51:53 +0000
+++ etc/maas/commissioning-user-data	2012-10-10 14:08:26 +0000
@@ -93,13 +93,24 @@
    exit 1
 }
 
-shutdown() {
-    echo "Finished, powering off."
-    /sbin/shutdown -P now
+write_poweroff_job() {
+   cat >/etc/init/maas-poweroff.conf <<EOF
+   description "poweroff when maas task is done"
+   start on stopped cloud-final
+   console output
+   task
+   script
+     [ ! -e /tmp/block-poweroff ] || exit 0
+     poweroff
+   end script
+EOF
+   # reload required due to lack of inotify in overlayfs (LP: #882147)
+   initctl reload-configuration
 }
 
 main() {
-   trap shutdown EXIT
+   write_poweroff_job
+
    # Install tools and load modules.
    aptget update
    aptget install freeipmi-tools