Merge lp:~jtv/maas/pkg-bug-1373237 into lp:~maas-maintainers/maas/packaging

[Jeroen T. Vermeulen]

Remove -u and -g options from start-cluster-controller command in packaging. The code no longer supports them.

This was breaking installation of maas-cluster-controller. It looks to be a side effect of celery removal.

Jeroen

[Newell Jensen (newell-jensen)]

review: Approve

[Jeroen T. Vermeulen (jtv)]

Thanks.

=== modified file 'debian/changelog'
--- debian/changelog	2014-09-24 04:22:43 +0000
+++ debian/changelog	2014-09-24 05:53:57 +0000
@@ -20,6 +20,8 @@
     - Don't install maas_local_celeryconfig_cluster.py any longer.
     - Don't symlink maas_local_celeryconfig_cluster.py from /etc to /usr.
     - Don't insert UUID into maas_local_celeryconfig_cluster.py.
+  * debian/maas-cluster-controller.maas-cluster-celery.upstart
+    - Don't pass -u/-g to start-cluster-controller; it no longer accepts them.
 
   [ Julian Edwards ]
   * debian/maas-region-controller.postinst: Don't restart RabbitMQ on

=== modified file 'debian/maas-cluster-controller.maas-cluster-celery.upstart'
--- debian/maas-cluster-controller.maas-cluster-celery.upstart	2013-12-05 17:43:07 +0000
+++ debian/maas-cluster-controller.maas-cluster-celery.upstart	2014-09-24 05:53:57 +0000
@@ -26,5 +26,5 @@
     # Allow the cluster-controller process to read CLUSTER_UUID as set
     # in that config file.
     export CLUSTER_UUID
-    exec /usr/bin/authbind --deep /usr/sbin/maas-provision start-cluster-controller $MAAS_URL -u maas -g maas
+    exec /usr/bin/authbind --deep /usr/sbin/maas-provision start-cluster-controller $MAAS_URL
 end script