← Back to branch summary

~andreserl/maas/backport_rev1410_to_stabilization

~andreserl/maas/backport_rev1410_to_stabilization

Viewing all changes in revision 1336.

Committer: Tarmac
Author(s): Jeroen Vermeulen
Date: 2012-12-12 16:32:55 UTC
mfrom: (1335.1.1 1.2-bug-1086239)
Revision ID: tarmac-20121212163255-tnkvica8ku5eyd0n

[r=jtv][bug=1086239][author=jtv] Backport trunk r1397: Take CLUSTER_UUID from maas_cluster.conf instead of maas_local_celeryconfig_cluster.py.

files added:
src/provisioningserver/cluster_config.py

src/provisioningserver/tests/test_cluster_config.py

files modified:
etc/democeleryconfig_cluster.py

services/cluster-worker/run

services/pserv/run

src/provisioningserver/auth.py

src/provisioningserver/boot_images.py

src/provisioningserver/dhcp/leases.py

src/provisioningserver/dhcp/tests/test_leases.py

src/provisioningserver/start_cluster_controller.py

src/provisioningserver/tags.py

src/provisioningserver/tests/test_auth.py

src/provisioningserver/tests/test_boot_images.py

src/provisioningserver/tftp.py

Show diffs side-by-side

added added

removed removed

etc/democeleryconfig_cluster.py

services/cluster-worker/run

services/pserv/run

src/provisioningserver/auth.py

src/provisioningserver/boot_images.py

src/provisioningserver/cluster_config.py

src/provisioningserver/dhcp/leases.py

src/provisioningserver/dhcp/tests/test_leases.py

src/provisioningserver/start_cluster_controller.py

src/provisioningserver/tags.py

src/provisioningserver/tests/test_auth.py

src/provisioningserver/tests/test_boot_images.py

src/provisioningserver/tests/test_cluster_config.py

src/provisioningserver/tftp.py

Older »