launchpad-reviewers team mailing list archive

[Raphaël Badin <raphael.badin@xxxxxxxxxxxxx>]

Raphaël Badin has proposed merging lp:~rvb/maas/add-local-cluster-config into lp:~maas-maintainers/maas/packaging with lp:~rvb/maas/recreate-region-worker as a prerequisite.

Commit message:
Use the new upstream file maas_local_celeryconfig_cluster.py as the local config file for the cluster controller.

Requested reviews:
  Launchpad code reviewers (launchpad-reviewers)

For more details, see:
https://code.launchpad.net/~rvb/maas/add-local-cluster-config/+merge/127114

Use the new upstream file maas_local_celeryconfig_cluster.py as the local config file for the cluster controller.
-- 
https://code.launchpad.net/~rvb/maas/add-local-cluster-config/+merge/127114
Your team Launchpad code reviewers is requested to review the proposed merge of lp:~rvb/maas/add-local-cluster-config into lp:~maas-maintainers/maas/packaging.

=== modified file 'debian/changelog'
--- debian/changelog	2012-09-29 17:43:22 +0000
+++ debian/changelog	2012-09-29 17:43:22 +0000
@@ -15,6 +15,8 @@
   * debian/maas-cluster-controller.postrm: Add and delete maas user.
 
   [ Raphael Badin ]
+  * Use maas_local_celeryconfig_cluster.py as the local celery
+    configuration file.
   * debian/maas-region-controller.maas-region-celery.upstart: Add region
     worker upstart script.
   * Rename cluster worker upstart script into

=== modified file 'debian/maas-cluster-controller.install'
--- debian/maas-cluster-controller.install	2012-09-29 17:43:22 +0000
+++ debian/maas-cluster-controller.install	2012-09-29 17:43:22 +0000
@@ -10,6 +10,9 @@
 # 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 all other stuff
 debian/extras/99-maas-sudoers etc/sudoers.d
 debian/extras/maas-provision usr/sbin

=== added file 'debian/maas-cluster-controller.links'
--- debian/maas-cluster-controller.links	1970-01-01 00:00:00 +0000
+++ debian/maas-cluster-controller.links	2012-09-29 17:43:22 +0000
@@ -0,0 +1,1 @@
+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	2012-09-28 21:06:45 +0000
+++ debian/maas-cluster-controller.postinst	2012-09-29 17:43:22 +0000
@@ -21,10 +21,10 @@
 if [ "$1" = "configure" ] && [ -z "$2" ]; then
     add_user_group
 
-    if grep -qs "^CLUSTER_UUID\ \= None$" /etc/maas/maas_local_celeryconfig.py; then
+    if grep -qs "^CLUSTER_UUID\ \= None$" /etc/maas/maas_local_celeryconfig_cluster.py; then
         uuid="$(uuidgen)"
         sed -i "s|^CLUSTER_UUID\ \= None$|CLUSTER_UUID = '"$uuid"'|" \
-                       /etc/maas/maas_local_celeryconfig.py
+                       /etc/maas/maas_local_celeryconfig_cluster.py
     fi
 fi
 

=== modified file 'debian/maas-common.install'
--- debian/maas-common.install	2012-09-29 17:43:22 +0000
+++ debian/maas-common.install	2012-09-29 17:43:22 +0000
@@ -1,3 +1,2 @@
 # Install Celery Config
 debian/tmp/usr/share/maas/celeryconfig_common.py
-debian/tmp/etc/maas/maas_local_celeryconfig.py

=== removed file 'debian/maas-common.links'
--- debian/maas-common.links	2012-09-28 21:06:45 +0000
+++ debian/maas-common.links	1970-01-01 00:00:00 +0000
@@ -1,1 +0,0 @@
-etc/maas/maas_local_celeryconfig.py usr/share/maas/maas_local_celeryconfig.py

=== modified file 'debian/maas-region-controller.install'
--- debian/maas-region-controller.install	2012-09-29 17:43:22 +0000
+++ debian/maas-region-controller.install	2012-09-29 17:43:22 +0000
@@ -13,6 +13,9 @@
 # Install celery config file
 debian/tmp/usr/share/maas/celeryconfig.py
 
+# Install local celery region config file
+debian/tmp/etc/maas/maas_local_celeryconfig.py
+
 # Install WSGI
 debian/tmp/usr/share/maas/wsgi.py
 

=== modified file 'debian/maas-region-controller.links'
--- debian/maas-region-controller.links	2012-09-25 23:14:52 +0000
+++ debian/maas-region-controller.links	2012-09-29 17:43:22 +0000
@@ -1,1 +1,2 @@
 etc/maas/maas_local_settings.py usr/share/maas/maas_local_settings.py
+etc/maas/maas_local_celeryconfig.py usr/share/maas/maas_local_celeryconfig.py