Merge lp:~allenap/maas/packaging.remove-maas into lp:~maas-maintainers/maas/packaging

[Gavin Panella]

Don't install Django settings into /usr/share/maas/maas.

For regiond these were squatting the `maas` namespace, preventing its use elsewhere.

[Gavin Panella (allenap)]

Corresponds to lp:~allenap/maas/remove-maas.

[Blake Rouse (blake-rouse)]

What about the upgrade path? Will the /usr/share/maas/maas be removed?

review: Needs Information

[Gavin Panella (allenap)]

> What about the upgrade path? Will the /usr/share/maas/maas be removed?

I tried this out on my NUCs and /usr/share/maas/maas was removed, I assume by the default packaging machinery.

[Blake Rouse (blake-rouse)]

Perfect!

review: Approve

=== modified file 'debian/changelog'
--- debian/changelog	2016-11-22 01:03:30 +0000
+++ debian/changelog	2016-12-02 09:33:29 +0000
@@ -1,6 +1,9 @@
 maas (2.2.0~alpha1+bzr5562-0ubuntu1) UNRELEASED; urgency=medium
 
   * UNRELEASED
+    - Don't install Django settings into /usr/share/maas/maas. For
+      regiond these were squatting the `maas` namespace, preventing its
+      use elsewhere (LP: 1646748)
 
  -- Andres Rodriguez <[e-mail]>  Mon, 21 Nov 2016 20:01:31 -0500
 

=== modified file 'debian/extras/maas-region'
--- debian/extras/maas-region	2016-03-07 22:01:56 +0000
+++ debian/extras/maas-region	2016-12-02 09:33:29 +0000
@@ -41,10 +41,8 @@
 
 def run():
     # Force the production MAAS Django configuration.
-    os.environ.setdefault("DJANGO_SETTINGS_MODULE", "maas.settings")
-
-    # The Django configuration lives outside of sys.path.
-    sys.path.append('/usr/share/maas')
+    os.environ.setdefault(
+        "DJANGO_SETTINGS_MODULE", "maasserver.djangosettings.settings")
 
     # Let Django do the rest.
     from django.core import management

=== modified file 'debian/maas-region-api.install'
--- debian/maas-region-api.install	2016-09-01 14:56:04 +0000
+++ debian/maas-region-api.install	2016-12-02 09:33:29 +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
 

=== modified file 'debian/maas-region-api.maas-regiond-worker@.service'
--- debian/maas-region-api.maas-regiond-worker@.service	2016-11-08 16:16:57 +0000
+++ debian/maas-region-api.maas-regiond-worker@.service	2016-12-02 09:33:29 +0000
@@ -13,8 +13,7 @@
 Restart=always
 RestartSec=10s
 Environment="MAAS_REGIOND_WORKER_ID=%i"
-Environment="DJANGO_SETTINGS_MODULE=maas.settings"
-Environment="PYTHONPATH=/usr/share/maas"
+Environment="DJANGO_SETTINGS_MODULE=maasserver.djangosettings.settings"
 Environment="LOGFILE=/var/log/maas/regiond.log"
 # Logs go to the journal; read them with:
 #   journalctl -u maas-regiond-worker@*