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

[Julian Edwards]

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

The cluster controller was not installing a necessary python module that contains the import_settings function required by the celery config.

[Andres Rodriguez (andreserl)]

Hi Julian,

So doing this will result in having both maas-region-controller and maas-cluster-controller shipping 'maas' in /usr/share/maas. This will cause a conflict on installation.

Since this is now required for both, the region and cluster, this should no longer be installer with maas-region-controller (as it currently is) and should be installed in a common package. I'm guessing that the best place to so so is in maas-common.

Futhermore, once this is installed on maas-common, and no longer installed in maas-region-controller, maas-common will require Replaces/Conflicts for maas-region controller (<= 0.1+bzr1243+dfsg-0ubuntu3 ).

Hope this helps.

Cheers.

review: Needs Fixing

[lp:~julian-edwards/maas/missing-import-bug-1065055]

132. By Julian Edwards on 2012-10-11

move install of maas/ files to maas-common

[Julian Edwards (julian-edwards)]

Darn! Ok moved to the maas-common package and conflicts/replaces added. How does it look now?

[Julian Edwards (julian-edwards)]

I am self-rejecting. The upstream needs to change here as the maas module is not on the pythonpath.

review: Disapprove

Unmerged revisions

132. By Julian Edwards on 2012-10-11

move install of maas/ files to maas-common

131. By Julian Edwards on 2012-10-11

update changelog

130. By Julian Edwards on 2012-10-11

In cluster-controller, install python module that contains import_settings

=== modified file 'debian/changelog'
--- debian/changelog	2012-10-10 16:08:56 +0000
+++ debian/changelog	2012-10-11 04:19:20 +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 <[e-mail]>  Wed, 10 Oct 2012 11:17:21 -0400
+  [ Julian Edwards ]
+  * debian/maas-cluster-controller.install: Install import_settings  (LP: #1065055)
+
+ -- Julian Edwards <[e-mail]>  Thu, 11 Oct 2012 12:10:16 +1000
 
 maas (0.1+bzr1243+dfsg-0ubuntu3) quantal; urgency=low
 

=== modified file 'debian/control'
--- debian/control	2012-10-09 17:28:25 +0000
+++ debian/control	2012-10-11 04:19:20 +0000
@@ -34,8 +34,10 @@
 Package: maas-common
 Architecture: all
 Depends: ${python:Depends}
-Conflicts: maas ( <= 0.1+bzr1048+dfsg-0ubuntu1 )
-Replaces: maas ( <= 0.1+bzr1048+dfsg-0ubuntu1 )
+Conflicts: maas ( <= 0.1+bzr1048+dfsg-0ubuntu1 ),
+           maas-region-controller ( <= 0.1+bzr1243+dfsg-0ubuntu3 )
+Replaces: maas ( <= 0.1+bzr1048+dfsg-0ubuntu1 ),
+          maas-region-controller ( <= 0.1+bzr1243+dfsg-0ubuntu3 )
 Description: Ubuntu MAAS Server
  Ubuntu MAAS Server is the successor to Orchestra. It offers a
  nice UI to provision your Ubuntu servers. Each physical server

=== modified file 'debian/maas-common.install'
--- debian/maas-common.install	2012-09-29 17:21:10 +0000
+++ debian/maas-common.install	2012-10-11 04:19:20 +0000
@@ -1,2 +1,5 @@
 # Install Celery Config
 debian/tmp/usr/share/maas/celeryconfig_common.py
+
+# Install settings files and settings importer
+debian/tmp/usr/lib/python*/dist-packages/maas usr/share/maas

=== modified file 'debian/maas-region-controller.install'
--- debian/maas-region-controller.install	2012-10-05 04:26:58 +0000
+++ debian/maas-region-controller.install	2012-10-11 04:19:20 +0000
@@ -1,6 +1,3 @@
-# Install project
-debian/tmp/usr/lib/python*/dist-packages/maas usr/share/maas
-
 # Install static files
 debian/tmp/usr/share/maas/web/static