launchpad-reviewers team mailing list archive

[Andres Rodriguez <andreserl@xxxxxxxxxxxxx>]

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

Commit message:
* New upstream release
* debian/maas.postinst:
  - Handle upgrades for new upstream release.
  - Handle upgrades for celery rabbitmq worker.
* debian/control:
  - Conflicts/Replaces on maas for python-maas-client
* debian/maas.postrm: Remove celery worker rabbitmq user and host.

Requested reviews:
  MAAS Maintainers (maas-maintainers)

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

=== modified file 'debian/changelog'
--- debian/changelog	2012-09-21 16:00:13 +0000
+++ debian/changelog	2012-09-21 16:58:20 +0000
@@ -1,4 +1,6 @@
-maas (0.1+bzr1030+dfsg-0ubuntu1) UNRELEASED; urgency=low
+maas (0.1+bzr1049+dfsg-0ubuntu1) UNRELEASED; urgency=low
+
+  * New upstream release
 
   [ Scott Moser ]
   * debian/maas-dhcp.{install,apparmor,postrm} install apparmor profile into
@@ -14,17 +16,23 @@
     - tests/maas-integration.py: Add
 
   [ Andres Rodriguez ]
-  * debian/maas.postinst: Always restart apache2.
+  * debian/maas.postinst:
+    - Always restart apache2.
+    - Handle upgrades for new upstream release.
+    - Handle upgrades for celery rabbitmq worker.
   * Add binary package to install client tool.
     - debian/extras/maas-cli: Add binary.
     - debian/maas-cli.install: Add. Install maascli and apiclient.
     - debian/control: Add binary package.
-  * debian/control: Depends on freeipmi-tools instead of ipmitool.
+  * debian/control:
+    - Depends on freeipmi-tools instead of ipmitool.
+    - Conflicts/Replaces on maas for python-maas-client
   * Add python-maas-client binary package:
     - debian/python-maas-client: Add. Install 'apiclient' python module.
     - debian/control: Add package. python-django-maas and maas-cli now
       Depend on it.
   * debian/rules: Install maas-dhcp-server upstart job.
+  * debian/maas.postrm: Remove celery worker rabbitmq user and host.
 
   [ Raphael Badin ]
   * Install maas_local_celeryconfig.py in /etc/maas and symlink to

=== modified file 'debian/control'
--- debian/control	2012-09-20 15:20:51 +0000
+++ debian/control	2012-09-21 16:58:20 +0000
@@ -73,6 +73,8 @@
 Depends: python-oauth,
          ${misc:Depends},
          ${python:Depends}
+Conflicts: maas (<= 0.1+bzr971+dfsg-0ubuntu2 )
+Replaces: maas (<= 0.1+bzr971+dfsg-0ubuntu2 )
 Description: Ubuntu MAAS API Client - (python files)
  Ubuntu MAAS Server is the successor to Orchestra. It offers a
  nice UI to provision your Ubuntu servers. Each physical server

=== modified file 'debian/maas.postinst'
--- debian/maas.postinst	2012-09-21 16:00:13 +0000
+++ debian/maas.postinst	2012-09-21 16:58:20 +0000
@@ -268,9 +268,9 @@
 	if dpkg --compare-versions "$2" lt 0.1+bzr459+dfsg-0ubuntu1; then
 		configure_maas_tgt
 	fi
-	# If upgrading from any version lower than 0.1+bzr1030+dfsg-0ubuntu1
+	# If upgrading from any version lower than 0.1+bzr1049+dfsg-0ubuntu1
 	# we need to regenerate the passwords and update configs.
-	if dpkg --compare-versions "$2" lt 0.1+bzr1030+dfsg-0ubuntu1; then
+	if dpkg --compare-versions "$2" lt 0.1+bzr1049+dfsg-0ubuntu1; then
 		# configure maas default url
 		db_get maas/default-maas-url
 		ipaddr="$RET"
@@ -278,6 +278,8 @@
 		# 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 $@
 		configure_maas_database "$dbc_dbpass"

=== modified file 'debian/maas.postrm'
--- debian/maas.postrm	2012-08-28 16:13:25 +0000
+++ debian/maas.postrm	2012-09-21 16:58:20 +0000
@@ -31,12 +31,17 @@
 			deluser maas || true
 		fi
 
-		# Remove rabbitmq/longpoll
+		# Remove rabbitmq/longpoll/celery
 		longpoll_user="maas_longpoll"
 		longpoll_vhost="/maas_longpoll"
+		workers_user="maas_workers"
+		workers_vhost="/maas_workers"
 		if [ -x /usr/sbin/rabbitmqctl ]; then
 			rabbitmqctl delete_vhost "$longpoll_vhost" || true
 			rabbitmqctl delete_user "$longpoll_user" || true
+
+			rabbitmqctl delete_vhost "$workers_vhost" || true
+			rabbitmqctl delete_user "$workers_user" || true
 		fi
 esac