← Back to team overview

launchpad-reviewers team mailing list archive

[Merge] lp:~julian-edwards/maas/missing-import-bug-1065055 into lp:~maas-maintainers/maas/packaging

 

Julian Edwards has proposed merging lp:~julian-edwards/maas/missing-import-bug-1065055 into lp:~maas-maintainers/maas/packaging.

Commit message:
* debian/maas-cluster-controller.install: Install import_settings  (LP: #1065055)

Requested reviews:
  Launchpad code reviewers (launchpad-reviewers)
Related bugs:
  Bug #1065055 in maas (Ubuntu): "celeryconfig_cluster.py imports utility method from maas (import_settings)"
  https://bugs.launchpad.net/ubuntu/+source/maas/+bug/1065055

For more details, see:
https://code.launchpad.net/~julian-edwards/maas/missing-import-bug-1065055/+merge/129080

The cluster controller was not installing a necessary python module that contains the import_settings function required by the celery config.
-- 
https://code.launchpad.net/~julian-edwards/maas/missing-import-bug-1065055/+merge/129080
Your team Launchpad code reviewers is requested to review the proposed merge of lp:~julian-edwards/maas/missing-import-bug-1065055 into lp:~maas-maintainers/maas/packaging.
=== modified file 'debian/changelog'
--- debian/changelog	2012-10-10 16:08:56 +0000
+++ debian/changelog	2012-10-11 02:13:21 +0000
@@ -4,7 +4,10 @@
   * debian/maas-region-controller.postinst: Enable proxy_http module.
   * debian/maas-cluster-controller.postinst: Create /var/lib/maas. (LP: #1065062)
 
- -- Andres Rodriguez <andreserl@xxxxxxxxxx>  Wed, 10 Oct 2012 11:17:21 -0400
+  [ Julian Edwards ]
+  * debian/maas-cluster-controller.install: Install import_settings  (LP: #1065055)
+
+ -- Julian Edwards <julian.edwards@xxxxxxxxxxxxx>  Thu, 11 Oct 2012 12:10:16 +1000
 
 maas (0.1+bzr1243+dfsg-0ubuntu3) quantal; urgency=low
 

=== modified file 'debian/maas-cluster-controller.install'
--- debian/maas-cluster-controller.install	2012-10-02 04:58:38 +0000
+++ debian/maas-cluster-controller.install	2012-10-11 02:13:21 +0000
@@ -13,6 +13,9 @@
 # Install local celery cluster config file
 debian/tmp/etc/maas/maas_local_celeryconfig_cluster.py
 
+# Install settings importer
+debian/tmp/usr/lib/python*/dist-packages/maas usr/share/maas
+
 # Install all other stuff
 debian/extras/99-maas-sudoers etc/sudoers.d
 debian/extras/maas-provision usr/sbin


Follow ups