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

[Jeroen T. Vermeulen]

Export CLUSTER_UUID from the cluster controller's upstart jobs to their respective daemon child processes.

The upstart jobs for pserv (the tftpd) and celery (start-cluster-controller) now source maas_cluster.conf, but they also need to export CLUSTER_UUID to get it included in the environments of the respective child processes they fork off.

Raphaël and I discussed the option of sticking the uuid on the command line as an option, but decided we didn't want to expose it to untrusted users on the same system.

Jeroen

[Raphaël Badin (rvb)]

review: Approve

=== modified file 'debian/maas-cluster-controller.maas-cluster-celery.upstart'
--- debian/maas-cluster-controller.maas-cluster-celery.upstart	2012-10-03 03:43:27 +0000
+++ debian/maas-cluster-controller.maas-cluster-celery.upstart	2012-12-13 10:10:45 +0000
@@ -21,6 +21,10 @@
 end script
 
 script
-    . $CONFIG_FILE  # sets MAAS_URL
+    # Prepare settings.
+    . $CONFIG_FILE
+    # Allow the cluster-controller process to read CLUSTER_UUID as set
+    # in that config file.
+    export CLUSTER_UUID
     exec /usr/sbin/maas-provision start-cluster-controller $MAAS_URL -u maas -g maas
 end script

=== modified file 'debian/maas-cluster-controller.maas-pserv.upstart'
--- debian/maas-cluster-controller.maas-pserv.upstart	2012-12-11 09:03:17 +0000
+++ debian/maas-cluster-controller.maas-pserv.upstart	2012-12-13 10:10:45 +0000
@@ -23,6 +23,9 @@
 script
     # Prepare settings.
     . $CONFIG_FILE
+    # Allow the tftpd process to read CLUSTER_UUID as set in that config
+    # file.
+    export CLUSTER_UUID
     # To add options to your daemon, edit the line below:
     exec /usr/bin/twistd -n --uid=maas --gid=maas --pidfile=/run/maas-pserv.pid --logfile=/dev/null maas-pserv --config-file=/etc/maas/pserv.yaml
 end script