launchpad-reviewers team mailing list archive

[Andres Rodriguez <andreserl@xxxxxxxxxxxxx>]

Andres Rodriguez has proposed merging lp:~andreserl/maas/quantal_packaging_updates into lp:~maas-maintainers/maas/packaging.quantal.

Requested reviews:
  MAAS Maintainers (maas-maintainers)

For more details, see:
https://code.launchpad.net/~andreserl/maas/quantal_packaging_updates/+merge/135264
-- 
https://code.launchpad.net/~andreserl/maas/quantal_packaging_updates/+merge/135264
Your team MAAS Maintainers is requested to review the proposed merge of lp:~andreserl/maas/quantal_packaging_updates into lp:~maas-maintainers/maas/packaging.quantal.

=== modified file 'debian/changelog'
--- debian/changelog	2012-11-19 19:05:03 +0000
+++ debian/changelog	2012-11-20 22:16:58 +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,11 @@
   * 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.
+  * debian/extras/99-maas-sudoers: Allow maas user to run maas-import-pxe-files.
+    Thanks to Raphael Badin.
 
   [ Gavin Panella ]
   * debian/extras/99-maas: squashfs image download is no longer needed.

=== modified file 'debian/extras/99-maas-sudoers'
--- debian/extras/99-maas-sudoers	2012-09-25 23:18:02 +0000
+++ debian/extras/99-maas-sudoers	2012-11-20 22:16:58 +0000
@@ -1,2 +1,3 @@
 maas ALL= NOPASSWD: /usr/sbin/service maas-dhcp-server restart
 maas ALL= NOPASSWD: /usr/sbin/maas-provision
+maas ALL= NOPASSWD: /usr/sbin/maas-import-pxe-files

=== 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-20 22:16:58 +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-20 22:16:58 +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-20 22:16:58 +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-20 22:16:58 +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-20 22:16:58 +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-20 22:16:58 +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