launchpad-reviewers team mailing list archive

[Andres Rodriguez <andreserl@xxxxxxxxxxxxx>]

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

Requested reviews:
  Launchpad code reviewers (launchpad-reviewers)

For more details, see:
https://code.launchpad.net/~andreserl/maas/packaging_updateS_bzr1134/+merge/127570
-- 
https://code.launchpad.net/~andreserl/maas/packaging_updateS_bzr1134/+merge/127570
Your team Launchpad code reviewers is requested to review the proposed merge of lp:~andreserl/maas/packaging_updateS_bzr1134 into lp:~maas-maintainers/maas/packaging.

=== modified file 'debian/changelog'
--- debian/changelog	2012-10-02 05:39:21 +0000
+++ debian/changelog	2012-10-02 18:46:18 +0000
@@ -1,10 +1,10 @@
-maas (0.1+bzr1122+dfsg-0ubuntu1) UNRELEASED; urgency=low
+maas (0.1+bzr1134+dfsg-0ubuntu2) UNRELEASED; urgency=low
 
   * New upstream release.
 
   [ Julian Edwards ]
   * Ensure isc-dhcp-server is disabled when installing maas-dhcp.
-  
+
   [ Raphaël Badin ]
   * Split celery config into cluster and region configs.
   * Add region celeryd upstart config.
@@ -17,7 +17,15 @@
   * Set root:maas ownership of local cluster config only *after*
     the maas user/group have been created
 
- -- Julian Edwards <julian.edwards@xxxxxxxxxxxxx>  Mon, 01 Oct 2012 17:13:57 +1000
+  [ Andres Rodriguez ]
+  * debian/maas-dhcp.postinst: Stop isc-dhcp-server not isc_dhcp_server.
+  * debian/maas-region-controller.postinst: Always update passwords
+    on upgrade. No longer check versioning. (LP: #1060094).
+  * debian/maas-cluster-controller.maas-cluster-celery.upstart: Remove set{uid/gid}.
+  * debian/control: Depends on python-netifaces.
+  * debian/maas-region-controller: Install maas-import-squashfs
+
+ -- Andres Rodriguez <andreserl@xxxxxxxxxx>  Tue, 02 Oct 2012 13:39:47 -0400
 
 maas (0.1+bzr1110+dfsg-0ubuntu1) quantal; urgency=low
 

=== modified file 'debian/control'
--- debian/control	2012-09-27 04:56:21 +0000
+++ debian/control	2012-10-02 18:46:18 +0000
@@ -84,7 +84,8 @@
 
 Package: python-maas-provisioningserver
 Architecture: all
-Depends: ${misc:Depends},
+Depends: python-netifaces,
+         ${misc:Depends},
          ${python:Depends}
 Conflicts: python-django-maas ( <= 0.1+bzr1048+dfsg-0ubuntu1 )
 Replaces: python-django-maas ( <= 0.1+bzr1048+dfsg-0ubuntu1 )

=== modified file 'debian/maas-cluster-controller.maas-cluster-celery.upstart'
--- debian/maas-cluster-controller.maas-cluster-celery.upstart	2012-10-01 14:01:07 +0000
+++ debian/maas-cluster-controller.maas-cluster-celery.upstart	2012-10-02 18:46:18 +0000
@@ -7,8 +7,6 @@
 
 start on filesystem and net-device-up
 stop on runlevel [016]
-setuid maas
-setgid maas
 
 env CONFIG_FILE=/etc/maas/maas_cluster.conf
 # Use cluster config.

=== modified file 'debian/maas-dhcp.postinst'
--- debian/maas-dhcp.postinst	2012-10-02 04:58:38 +0000
+++ debian/maas-dhcp.postinst	2012-10-02 18:46:18 +0000
@@ -4,7 +4,7 @@
 db_version 2.0
 
 stop_isc_dhcp_server(){
-    service isc_dhcp_server stop
+    invoke-rc.d isc-dhcp-server stop
 }
 
 

=== modified file 'debian/maas-region-controller.install'
--- debian/maas-region-controller.install	2012-09-29 17:21:10 +0000
+++ debian/maas-region-controller.install	2012-10-02 18:46:18 +0000
@@ -27,8 +27,10 @@
 
 # Install maas-import-pxe-files and related files
 etc/cron.d/maas-import-pxe-files
-etc/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-squashfs
+debian/tmp/etc/maas/import_squashfs
 debian/tmp/usr/sbin/maas-import-ephemerals
 debian/tmp/etc/maas/import_ephemerals
 debian/tmp/etc/maas/commissioning-user-data

=== modified file 'debian/maas-region-controller.postinst'
--- debian/maas-region-controller.postinst	2012-10-02 11:00:41 +0000
+++ debian/maas-region-controller.postinst	2012-10-02 18:46:18 +0000
@@ -266,20 +266,20 @@
 
 	# If upgrading from any version lower than 0.1+bzr1063+dfsg-0ubuntu1
 	# we need to regenerate the passwords and update configs.
-	if dpkg --compare-versions "$2" lt 0.1+bzr1063+dfsg-0ubuntu1; then
-		# configure maas default url
-		db_get maas/default-maas-url
-		ipaddr="$RET"
-		configure_maas_default_url "$ipaddr"
-		# make sure rabbitmq is running
-		restart_rabbitmq
-		configure_maas_txlongpoll_rabbitmq_user
-		# Handle celery/rabbitmq publishing
-		configure_maas_workers_rabbitmq_user
-		# handle database upgrade
-		dbc_go maas-region-controller $@
-		configure_maas_database "$dbc_dbpass"
-	fi
+	#if dpkg --compare-versions "$2" lt 0.1+bzr1134+dfsg-0ubuntu1; then
+	# configure maas default url
+	db_get maas/default-maas-url
+	ipaddr="$RET"
+	configure_maas_default_url "$ipaddr"
+	# make sure rabbitmq is running
+	restart_rabbitmq
+	configure_maas_txlongpoll_rabbitmq_user
+	# Handle celery/rabbitmq publishing
+	configure_maas_workers_rabbitmq_user
+	# handle database upgrade
+	dbc_go maas-region-controller $@
+	configure_maas_database "$dbc_dbpass"
+	#fi
 
 	maas_sync_migrate_db