launchpad-reviewers team mailing list archive

["Jeroen T. Vermeulen" <jtv@xxxxxxxxxxxxx>]

Jeroen T. Vermeulen has proposed merging lp:~jtv/maas/pkg-move-power-templates-and-config into lp:~maas-maintainers/maas/packaging.

Commit message:
Packaging change: install power templates & config to /etc/maas/templates/power/.

Requested reviews:
  Launchpad code reviewers (launchpad-reviewers)

For more details, see:
https://code.launchpad.net/~jtv/maas/pkg-move-power-templates-and-config/+merge/167096

This accompanies the trunk change in https://code.launchpad.net/~jtv/maas/move-power-templates-and-config/+merge/167095 and follows the same coupled-branches pattern as I used for the PXE templates.

Once both branches have been approved, I'll land that trunk change and in this packaging branch, update debian/changelog to match its revision.

There will be an initial conflict as the PXE templates packaging branch lands.  Bear with me.


Jeroen
-- 
https://code.launchpad.net/~jtv/maas/pkg-move-power-templates-and-config/+merge/167096
Your team Launchpad code reviewers is requested to review the proposed merge of lp:~jtv/maas/pkg-move-power-templates-and-config into lp:~maas-maintainers/maas/packaging.

=== modified file 'debian/maas-cluster-controller.install'
--- debian/maas-cluster-controller.install	2013-05-22 14:01:27 +0000
+++ debian/maas-cluster-controller.install	2013-06-03 17:02:29 +0000
@@ -13,6 +13,9 @@
 # Install local celery cluster config file
 debian/tmp/etc/maas/maas_local_celeryconfig_cluster.py
 
+# Install power templates and config
+debian/tmp/etc/maas/templates/power
+
 # Install maas-import-pxe-files and related files
 debian/tmp/usr/sbin/maas-import-pxe-files
 man/maas-import-pxe-files.8 usr/share/man/man8