Merge lp:~andreserl/maas/quantal_packaging_updates into lp:~maas-maintainers/maas/packaging.quantal

[Andres Rodriguez]

maas-cluster-controller installs tgtd and import scripts and related files.

[Andres Rodriguez (andreserl)]

As far as I understand, now the Cluster Controller is the one in charge of downloading and storing the images, and it is celery that runs them. This fix has been backported to the 1.2 branch as part as the stabilization fixes.

For this reason, I have back ported this from the raring branch as it would continue to be required. This installs the necessary scripts as well as the tgtd stuff in the cluster-controller rather than in region-controller.

Please, verify this is the case.

[Julian Edwards (julian-edwards)]

review: Approve

[Julian Edwards (julian-edwards)]

I am also keeping the precise packaging changes in a branch here lp:~julian-edwards/maas/precise-backport

It will need the same change, so I'll take this diff and apply it to my branch when this one lands.

[Julian Edwards (julian-edwards)]

My bad - this is unnecessary as we have not backported the downloading via the clusters.

review: Disapprove

[Julian Edwards (julian-edwards)]

GRAR, let's get this straight - the sudoers change is not necessary, everything else is :)

review: Needs Information

[Julian Edwards (julian-edwards)]

review: Needs Fixing

[Andres Rodriguez (andreserl)]

Fixed. Approving

[MAAS Lander (maas-lander)]

No commit message specified.

[MAAS Lander (maas-lander)]

Voting does not meet specified criteria. Required: Approve >= 1, Disapprove == 0. Got: 1 Needs Fixing.

[Andres Rodriguez (andreserl)]

review: Approve

[Julian Edwards (julian-edwards)]

review: Approve

=== modified file 'debian/changelog'
--- debian/changelog	2012-11-19 19:05:03 +0000
+++ debian/changelog	2012-11-21 01:21:20 +0000
@@ -1,4 +1,4 @@
-maas (0.1+bzr1307+dfsg-0ubuntu1) UNRELEASED; urgency=low
+maas (0.1+bzr1309+dfsg-0ubuntu1) UNRELEASED; urgency=low
 
   * New upstream bugfix release. Fixes:
     - IPMI detection ends up with power_address of 0.0.0.0 (LP: #1064224)
@@ -39,6 +39,9 @@
   * debian/maas-cluster-controller.config: If URL has been detected, add /MAAS if
     it doesn't contain it. This helps upgrades from versions where DEFAULT_MAAS_URL
     didn't use /MAAS.
+  * Install maas-import-pxe-files and related files with maas-cluster-controller,
+    as well as configure tgtd, as maas-region-controller no longer stores images.
+    Thanks to Jeroen Vermuelen.
 
   [ Gavin Panella ]
   * debian/extras/99-maas: squashfs image download is no longer needed.

=== modified file 'debian/maas-cluster-controller.install'
--- debian/maas-cluster-controller.install	2012-10-10 19:06:52 +0000
+++ debian/maas-cluster-controller.install	2012-11-21 01:21:20 +0000
@@ -13,6 +13,17 @@
 # Install local celery cluster config file
 debian/tmp/etc/maas/maas_local_celeryconfig_cluster.py
 
+# Install maas-import-pxe-files
+debian/tmp/usr/sbin/maas-import-pxe-files
+etc/cron.d/maas-import-pxe-files
+man/maas-import-pxe-files.8 usr/share/man/man8
+debian/tmp/etc/maas/import_pxe_files
+debian/tmp/usr/sbin/maas-import-ephemerals
+debian/tmp/etc/maas/import_ephemerals
+debian/tmp/etc/maas/commissioning-user-data
+# Obsolete, but still available for compatibility:
+scripts/maas-import-isos usr/sbin
+
 # Install all other stuff
 debian/extras/99-maas-sudoers etc/sudoers.d
 debian/extras/isc-dhcp-server.override etc/init

=== modified file 'debian/maas-cluster-controller.postinst'
--- debian/maas-cluster-controller.postinst	2012-10-11 18:16:28 +0000
+++ debian/maas-cluster-controller.postinst	2012-11-21 01:21:20 +0000
@@ -17,6 +17,15 @@
     chmod -R 775 /var/log/maas/oops
 }
 
+configure_maas_tgt(){
+	# Set up iSCSI: add maas.conf to tgt conf.d.
+	local tgtcfg="/etc/tgt/targets.conf"
+	[ -d /etc/tgt/conf.d/ ] || 
+	   echo "Warning! $tgtcfg did not exist" 1>&2;
+	mkdir -p /etc/tgt/conf.d/ /var/lib/maas/ephemeral/
+	ln -sf /var/lib/maas/ephemeral/tgt.conf /etc/tgt/conf.d/maas.conf
+}
+
 if [ "$1" = "configure" ] && [ -z "$2" ]; then
     # logging
     create_log_dir
@@ -32,6 +41,8 @@
         sed -i "s|^CLUSTER_UUID\ \= None$|CLUSTER_UUID = '"$uuid"'|" \
                        /etc/maas/maas_local_celeryconfig_cluster.py
     fi
+
+    configure_maas_tgt
 fi
 
 if ([ "$1" = "configure" ] && [ -z "$2" ]) || [ "$1" = "reconfigure" ] || [ -n "$DEBCONF_RECONFIGURE" ]; then

=== modified file 'debian/maas-cluster-controller.postrm'
--- debian/maas-cluster-controller.postrm	2012-10-11 18:16:28 +0000
+++ debian/maas-cluster-controller.postrm	2012-11-21 01:21:20 +0000
@@ -18,6 +18,11 @@
 			rm -rf /var/lib/maas
 		fi
 
+		# Delete symlink for iSCSI config.
+		if [ -L /etc/tgt/conf.d/maas.conf ]; then
+			rm -rf /etc/tgt/conf.d/maas.conf
+		fi
+
 esac
 
 #DEBHELPER#

=== modified file 'debian/maas-region-controller.install'
--- debian/maas-region-controller.install	2012-11-15 15:10:10 +0000
+++ debian/maas-region-controller.install	2012-11-21 01:21:20 +0000
@@ -22,19 +22,6 @@
 # Install txlongpoll config file
 debian/tmp/etc/maas/txlongpoll.yaml
 
-# Install maas-import-pxe-files
-debian/tmp/usr/sbin/maas-import-pxe-files
-
-# Install maas-import-pxe-files and related files
-etc/cron.d/maas-import-pxe-files
-man/maas-import-pxe-files.8 usr/share/man/man8
-debian/tmp/etc/maas/import_pxe_files
-debian/tmp/usr/sbin/maas-import-ephemerals
-debian/tmp/etc/maas/import_ephemerals
-debian/tmp/etc/maas/commissioning-user-data
-# Obsolete, but still available for compatibility:
-scripts/maas-import-isos usr/sbin
-
 # Install new preseed files
 debian/tmp/usr/share/maas/preseeds
 

=== modified file 'debian/maas-region-controller.postinst'
--- debian/maas-region-controller.postinst	2012-10-16 14:30:48 +0000
+++ debian/maas-region-controller.postinst	2012-11-21 01:21:20 +0000
@@ -104,14 +104,6 @@
 	fi
 }
 
-configure_maas_tgt(){
-	local tgtcfg="/etc/tgt/targets.conf"
-	[ -d /etc/tgt/conf.d/ ] || 
-	   echo "Warning! $tgtcfg did not exist" 1>&2;
-	mkdir -p /etc/tgt/conf.d/ /var/lib/maas/ephemeral/
-	ln -sf /var/lib/maas/ephemeral/tgt.conf /etc/tgt/conf.d/maas.conf
-}
-
 configure_maas_default_url() {
 	local ipaddr="$1"
 
@@ -227,11 +219,6 @@
 	configure_maas_workers_rabbitmq_user "$ipaddr"
 
 	#########################################################
-	######## add maas.conf to tgt conf.d ####################
-	#########################################################
-	configure_maas_tgt
-
-	#########################################################
 	################  Configure Database  ###################
 	#########################################################
 

=== modified file 'debian/maas-region-controller.postrm'
--- debian/maas-region-controller.postrm	2012-10-11 18:16:28 +0000
+++ debian/maas-region-controller.postrm	2012-11-21 01:21:20 +0000
@@ -27,11 +27,6 @@
 		fi
 
 		# Delete symlink
-		if [ -L /etc/tgt/conf.d/maas.conf ]; then
-			rm -rf /etc/tgt/conf.d/maas.conf
-		fi
-
-		# Delete symlink
 		if [ -L /etc/squid-deb-proxy/mirror-dstdomain.acl.d/99-maas ]; then
 			rm -rf /etc/squid-deb-proxy/mirror-dstdomain.acl.d/99-maas
 		fi