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

[Jeroen T. Vermeulen]

Fix packaging, which was no longer building successfully: some Celery configuration files were removed from trunk, so the packaging should no longer install/update them.

This also gets rid of one of those nasty modify-files-in-/etc situations.

Jeroen

[Newell Jensen (newell-jensen)]

I just ran into this trying to build the package.

review: Approve

[Jeroen T. Vermeulen (jtv)]

There's still some unrelated breakage, stopping the cluster controller from installing. I'll land this branch (because at least it's progress) and then focus on that other failure. Thanks for the review.

=== modified file 'debian/changelog'
--- debian/changelog	2014-09-21 22:05:31 +0000
+++ debian/changelog	2014-09-24 05:03:40 +0000
@@ -1,4 +1,4 @@
-maas (1.7.0~beta3+bzr3043-0ubuntu1) trusty; urgency=medium
+maas (1.7.0~beta3+bzr3067-0ubuntu1) trusty; urgency=medium
 
   * New Upstream Snapshot, Beta 3 bzr3043
 
@@ -12,6 +12,14 @@
   * debian/maas-region-controller-min.install
     debian/maas-region-controller-min.lintian-overrides
     - Install deployment user-data: maas_configure_interfaces.py script.
+  * debian/maas-cluster-controller.links
+    debian/maas-cluster-controller.install
+    debian/maas-cluster-controller.postinst
+    - Reflect Celery removal changes made in trunk r3067.
+    - Don't install celeryconfig_cluster.py any longer. 
+    - 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.
 
   [ Julian Edwards ]
   * debian/maas-region-controller.postinst: Don't restart RabbitMQ on

=== modified file 'debian/maas-cluster-controller.install'
--- debian/maas-cluster-controller.install	2014-05-27 10:22:58 +0000
+++ debian/maas-cluster-controller.install	2014-09-24 05:03:40 +0000
@@ -7,12 +7,6 @@
 # Install cluster config file
 debian/tmp/etc/maas/maas_cluster.conf
 
-# Install celery config file
-debian/tmp/usr/share/maas/celeryconfig_cluster.py
-
-# Install local celery cluster config file
-debian/tmp/etc/maas/maas_local_celeryconfig_cluster.py
-
 # Install templates
 debian/tmp/etc/maas/templates/dhcp
 debian/tmp/etc/maas/templates/power

=== removed file 'debian/maas-cluster-controller.links'
--- debian/maas-cluster-controller.links	2012-09-29 17:21:10 +0000
+++ debian/maas-cluster-controller.links	1970-01-01 00:00:00 +0000
@@ -1,1 +0,0 @@
-etc/maas/maas_local_celeryconfig_cluster.py usr/share/maas/maas_local_celeryconfig_cluster.py

=== modified file 'debian/maas-cluster-controller.postinst'
--- debian/maas-cluster-controller.postinst	2014-09-10 14:07:57 +0000
+++ debian/maas-cluster-controller.postinst	2014-09-24 05:03:40 +0000
@@ -49,28 +49,23 @@
     # maas_cluster.conf; otherwise, we want to generate one.
     local uuid
 
-
     if [ -n "$(extract_cluster_uuid /etc/maas/maas_cluster.conf)" ]; then
         # UUID is already set up.  Wonderful.
         return
     fi
 
     # Look for a UUID stored in the old location.
-    uuid="$(extract_cluster_uuid /etc/maas/maas_local_celeryconfig_cluster.py)"
+    if [ -e '/etc/maas/maas_local_celeryconfig_cluster.py' ]; then
+        uuid="$(extract_cluster_uuid /etc/maas/maas_local_celeryconfig_cluster.py)"
+    fi
 
     if [ -z "$uuid" ]; then
-        # No UUID at all yet.  Generate one, and insert it into its
-        # placeholder in the old config location.
+        # No UUID at all yet.  Generate one.
         uuid="$(uuidgen)"
-        sed -i "s|^CLUSTER_UUID = None$|CLUSTER_UUID = '$uuid'|" \
-            /etc/maas/maas_local_celeryconfig_cluster.py
     fi
 
-    # Either way, at this point we have a uuid, and it is configured in
-    # the old config location.
-    #
-    # Write it to maas_cluster.conf as well.  There is no initial
-    # placeholder in this file, so just append the setting.
+    # Write the uuid to maas_cluster.conf
+    # There is no initial placeholder in this file, so just append the setting.
     echo "CLUSTER_UUID=\"$uuid\"" >>/etc/maas/maas_cluster.conf
 }
 
@@ -150,14 +145,10 @@
     configure_maas_tgt
     configure_pserv_generator
 
-    # These config files may contain a private cluster UUID.  Only maas
-    # can read them; only root can write them
-    chown root:maas \
-        /etc/maas/maas_local_celeryconfig_cluster.py \
-        /etc/maas/maas_cluster.conf
-    chmod 0640 \
-        /etc/maas/maas_local_celeryconfig_cluster.py \
-        /etc/maas/maas_cluster.conf
+    # This config file may contain a private cluster UUID.  Only maas
+    # can read it; only root can write it.
+    chown root:maas /etc/maas/maas_cluster.conf
+    chmod 0640 /etc/maas/maas_cluster.conf
 
     configure_cluster_uuid
     configure_cluster_authbind