Merge lp:~jtv/maas/pkg-new-tgt-link into lp:~maas-maintainers/maas/packaging

[Jeroen T. Vermeulen]

Configure tgt to re-configure MAAS iSCSI targets on reboot.

This is similar to what we had for the old import script, though of course the symlink now points to the new storage location.

The other difference is that the link needs to be created not only on initial installation, but on upgrade as well. A link created by older versions of the package won't do, because of the change in storage location.

Jeroen

[Graham Binns (gmb)]

[0]

Commit message needs a "previously on Breaking MAAS" section. :)

Otherwise LGTM.

review: Approve

[Andres Rodriguez (andreserl)]

/var/lib/maas/boot-resources/current/ -> On clean installs this directory is not present right? We should make sure this also gets created.

 mkdir -p /etc/tgt/conf.d /var/lib/maas/boot-resources/current/

[Raphaël Badin (rvb)]

You probably need to add a changelog entry for this change.

[Julian Edwards (julian-edwards)]

On Tuesday 01 Apr 2014 22:15:01 you wrote:
> You probably need to add a changelog
entry for this change.

s/probably/definitely/

=== modified file 'debian/maas-cluster-controller.postinst'
--- debian/maas-cluster-controller.postinst	2014-03-31 02:43:20 +0000
+++ debian/maas-cluster-controller.postinst	2014-04-01 04:21:46 +0000
@@ -21,6 +21,14 @@
     chmod -R 775 /var/log/maas/oops
 }
 
+configure_maas_tgt() {
+    # Ensure that iSCSI targets get re-defined on reboot.
+    # Creates a softlink in /etc/tgt/conf.d/ that points to the current
+    # boot images' tgt configuration.
+    mkdir -p /etc/tgt/conf.d
+    ln -sf /var/lib/maas/boot-resources/current/maas.tgt /etc/tgt/conf.d/maas.conf
+}
+
 extract_cluster_uuid(){
     # Extract ClUSTER_UUID setting from config file $1.  This will work
     # both the cluster celery config (which is python) and the cluster
@@ -123,8 +131,8 @@
 
 
 if [ "$1" = "configure" ] && [ -z "$2" ]; then
-    # logging
     create_log_dir
+    configure_maas_tgt
 fi
 
 if [ "$1" = "configure" ]; then
@@ -132,6 +140,7 @@
         create_log_dir
     fi
 
+    configure_maas_tgt
     configure_pserv_generator
 
     # These config files may contain a private cluster UUID.  Only maas