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

[Gavin Panella]

Packaging for maas-regiond.

From the changelog:

  * debian/maas-region-controller-min.maas-regiond.upstart
    - Upstart script for the new maas-regiond.
    - Use setuid/setgid to drop root privs before running script.
    - Don't write a pid file.
  * debian/maas-cluster-controller.maas-clusterd.upstart
    - Start maas-clusterd; it's no longer called maas-pserv.
  * debian/maas-region-controller-min.install
    - Don't install wsgi.py; it's no longer used.
  * debian/rules
    - Install maas-regiond plugin.
  * debian/maas-region-controller-min.apport
    debian/maas-region-controller-min.logrotate
    debian/maas-region-controller-min.postinst
    debian/maas-region-controller.postinst
    - Change maas-django.log to regiond.log.
  * debian/maas-region-controller.postinst
    - Restart maas-regiond after installation.
  * debian/maas-region-controller.postinst
    - Restart maas-regiond after installation.
  * debian/control
    debian/maas-region-controller-min.postinst
    debian/maas-region-controller.postinst
    - mod_wsgi is no longer used.
  * debian/maas-region-controller-min.logrotate
    - No longer used; maas-regiond uses rotatelogs.
  * debian/patches/01-fix-database-settings.patch
    - Move STATIC_ROOT setting upstream.
    - Simplify database configuration hunk.

[lp:~allenap/maas/packaging.regiond]

346. By Gavin Panella on 2014-12-09

Merged packaging.rename-scripts-and-prepare-for-twistd-in-region into packaging.regiond, resolving conflicts.

347. By Gavin Panella on 2014-12-09

STATIC_ROOT no longer needs patching.

[Andres Rodriguez (andreserl)]

Overall, it looks good to me. The only thing missing is handling upgrades, but that's something I can take care of on a different branch once this gets merged, as long as fresh installs work just fine!

Other than that, see minor comments inline to get this merged.

review: Needs Fixing

[lp:~allenap/maas/packaging.regiond]

348. By Gavin Panella on 2015-01-13

Merge trunk.

349. By Gavin Panella on 2015-01-13

Fix-up changelog.

350. By Gavin Panella on 2015-01-13

Increase log file rotation threshold to 10MB.

351. By Gavin Panella on 2015-01-13

No need to restart maas-regiond; DEBHELPER does it for us.

[Gavin Panella (allenap)]

Thanks Andres. I've addressed your comments. Can you take another look?

[Andres Rodriguez (andreserl)]

lgtm! I still don't feel confident of having log rotation on the upstart job, as I've never seen that been done before. However, we can give it a try and if not, change it at any later time.

review: Approve

=== modified file 'debian/changelog'
--- debian/changelog	2014-12-17 16:03:58 +0000
+++ debian/changelog	2015-01-13 18:02:57 +0000
@@ -16,6 +16,36 @@
 
   * debian/control: Tighten Dependency versioning of some packages.
 
+  [ Gavin Panella ]
+  * debian/maas-region-controller-min.maas-regiond.upstart
+    - Upstart script for the new maas-regiond.
+    - Use setuid/setgid to drop root privs before running script.
+    - Don't write a pid file.
+  * debian/maas-cluster-controller.maas-clusterd.upstart
+    - Start maas-clusterd; it's no longer called maas-pserv.
+  * debian/maas-region-controller-min.install
+    - Don't install wsgi.py; it's no longer used.
+  * debian/rules
+    - Install maas-regiond plugin.
+  * debian/maas-region-controller-min.apport
+    debian/maas-region-controller-min.logrotate
+    debian/maas-region-controller-min.postinst
+    debian/maas-region-controller.postinst
+    - Change maas-django.log to regiond.log.
+  * debian/maas-region-controller.postinst
+    - Restart maas-regiond after installation.
+  * debian/maas-region-controller.postinst
+    - Restart maas-regiond after installation.
+  * debian/control
+    debian/maas-region-controller-min.postinst
+    debian/maas-region-controller.postinst
+    - mod_wsgi is no longer used.
+  * debian/maas-region-controller-min.logrotate
+    - No longer used; maas-regiond uses rotatelogs.
+  * debian/patches/01-fix-database-settings.patch
+    - Move STATIC_ROOT setting upstream.
+    - Simplify database configuration hunk.
+
  -- Andres Rodriguez <[e-mail]>  Fri, 14 Nov 2014 09:04:29 -0500
 
 maas (1.7.0+bzr3299-0ubuntu1) utopic; urgency=medium
@@ -117,7 +147,7 @@
     debian/maas-cluster-controller.install
     debian/maas-cluster-controller.postinst
     - Reflect Celery removal changes made in trunk r3067.
-    - Don't install celeryconfig_cluster.py any longer. 
+    - Don't install celeryconfig_cluster.py any longer.
     - Don't install maas_local_celeryconfig_cluster.py any longer.
     - Don't symlink maas_local_celeryconfig_cluster.py from /etc to /usr.
     - Don't insert UUID into maas_local_celeryconfig_cluster.py.

=== modified file 'debian/control'
--- debian/control	2014-12-17 18:32:22 +0000
+++ debian/control	2015-01-13 18:02:57 +0000
@@ -48,10 +48,10 @@
 Package: maas-region-controller-min
 Architecture: all
 Depends: apache2,
+         apache2-utils,
          bind9utils,
          dbconfig-common,
          iproute,
-         libapache2-mod-wsgi,
          libjs-raphael,
          libjs-yui3-full,
          libjs-yui3-min,

=== modified file 'debian/maas-cluster-controller.maas-clusterd.upstart'
--- debian/maas-cluster-controller.maas-clusterd.upstart	2014-10-15 11:11:37 +0000
+++ debian/maas-cluster-controller.maas-clusterd.upstart	2015-01-13 18:02:57 +0000
@@ -1,8 +1,4 @@
-# maas-cluster - provisioning service
-#
-# MAAS Provisioning Service
-
-description     "MAAS"
+description "MAAS Cluster Controller"
 author "Andres Rodriguez <[e-mail]>"
 
 start on filesystem and net-device-up
@@ -51,5 +47,5 @@
     # To add options to your daemon, edit the line below:
     exec /usr/bin/authbind --deep /usr/bin/twistd \
         --nodaemon --uid=maas --gid=maas --pidfile=/run/maas-cluster.pid \
-        --logfile=/dev/null maas-pserv --config-file=/etc/maas/pserv.yaml
+        --logfile=/dev/null maas-clusterd --config-file=/etc/maas/pserv.yaml
 end script

=== modified file 'debian/maas-region-controller-min.apport'
--- debian/maas-region-controller-min.apport	2014-09-25 17:50:15 +0000
+++ debian/maas-region-controller-min.apport	2015-01-13 18:02:57 +0000
@@ -2,7 +2,7 @@
 
 '''apport hook for maas-region-controller
 
-(c) 2012 Canonical Ltd.
+(c) 2012-2014 Canonical Ltd.
 Author: Andres Rodriguez <[e-mail]>
 
 This program is free software; you can redistribute it and/or modify it
@@ -12,25 +12,28 @@
 the full text of the license.
 '''
 
-from apport.hookutils import *
+from apport.hookutils import (
+    attach_conffiles,
+    attach_file_if_exists,
+    attach_related_packages,
+)
+
 
 def add_info(report, ui):
-    response = ui.yesno("The contents of your /etc/maas/maas_local_settings.py, "
-                        "/etc/maas/pserv.yaml files "
-                        "may help developers diagnose your bug more "
-                        "quickly.  However, it may contain sensitive "
-                        "information.  Do you want to include it in your "
-                        "bug report?")
+    response = ui.yesno(
+        "The contents of your /etc/maas/maas_local_settings.py, "
+        "/etc/maas/pserv.yaml files may help developers diagnose your bug "
+        "more quickly.  However, it may contain sensitive information.  Do "
+        "you want to include it in your bug report?")
 
-    if response == None: # user cancelled
+    if response is None:  # user cancelled
         raise StopIteration
-
-    elif response == True:
-        attach_conffiles(report,'maas')
+    elif response is True:
+        attach_conffiles(report, 'maas')
 
     # Attaching log files
-    attach_file_if_exists(report, '/var/log/maas/maas-django.log', 'MAASLog')
-    attach_file_if_exists(report, '/var/log/maas/pserv.log', 'MAASPservLog')
+    attach_file_if_exists(report, '/var/log/maas/regiond.log', 'MAASRegionLog')
+    attach_file_if_exists(report, '/var/log/maas/pserv.log', 'MAASClusterLog')
 
     # Attaching related packages info
     attach_related_packages(report, ['python-django-maas', 'apparmor'])

=== modified file 'debian/maas-region-controller-min.install'
--- debian/maas-region-controller-min.install	2014-09-25 20:19:36 +0000
+++ debian/maas-region-controller-min.install	2015-01-13 18:02:57 +0000
@@ -10,9 +10,6 @@
 # Install MAAS local settings
 debian/tmp/etc/maas/maas_local_settings.py
 
-# Install WSGI
-debian/tmp/usr/share/maas/wsgi.py
-
 # Install new preseed files
 debian/tmp/etc/maas/preseeds
 
@@ -27,6 +24,9 @@
 # Install winrm certificate generation script
 debian/tmp/usr/bin/maas-generate-winrm-cert
 
+# Install twisted plugins
+twisted/plugins/maasregiond.py usr/share/pyshared/twisted/plugins
+
 # Install all other stuff
 debian/extras/maas-region-admin usr/sbin
 debian/extras/20-maas.conf etc/rsyslog.d

=== removed file 'debian/maas-region-controller-min.logrotate'
--- debian/maas-region-controller-min.logrotate	2014-09-25 17:50:15 +0000
+++ debian/maas-region-controller-min.logrotate	1970-01-01 00:00:00 +0000
@@ -1,8 +0,0 @@
-/var/log/maas/maas-django.log {
- rotate 5
- weekly
- compress
- copytruncate
- missingok
- #create 620 root www-data
-}

=== added file 'debian/maas-region-controller-min.maas-regiond.upstart'
--- debian/maas-region-controller-min.maas-regiond.upstart	1970-01-01 00:00:00 +0000
+++ debian/maas-region-controller-min.maas-regiond.upstart	2015-01-13 18:02:57 +0000
@@ -0,0 +1,19 @@
+description "MAAS Region Controller"
+author "Gavin Panella <[e-mail]>"
+
+start on filesystem and net-device-up
+stop on runlevel [016]
+
+setuid maas
+setgid maas
+
+respawn
+
+env DJANGO_SETTINGS_MODULE=maas.settings
+env PYTHONPATH=/usr/share/maas
+env LOGFILE=/var/log/maas/regiond.log
+
+script
+    exec /usr/bin/twistd --nodaemon --pidfile= maas-regiond 2>&1 | \
+        /usr/bin/rotatelogs -f -L "${LOGFILE}" "${LOGFILE}" 10M
+end script

=== modified file 'debian/maas-region-controller-min.postinst'
--- debian/maas-region-controller-min.postinst	2014-09-25 20:19:36 +0000
+++ debian/maas-region-controller-min.postinst	2015-01-13 18:02:57 +0000
@@ -27,7 +27,6 @@
     # enable apache modules needed
     a2enmod proxy_http
     a2enmod expires
-    a2enmod wsgi
 }
 
 configure_maas_default_url() {
@@ -88,8 +87,8 @@
     #########################################################
 
     # Give appropriate permissions
-    if [ ! -f /var/log/maas/maas-django.log ]; then
-        touch /var/log/maas/maas-django.log
+    if [ ! -f /var/log/maas/regiond.log ]; then
+        touch /var/log/maas/regiond.log
     fi
     chown -R maas:maas /var/log/maas
     chmod -R 775 /var/log/maas/oops

=== modified file 'debian/maas-region-controller.postinst'
--- debian/maas-region-controller.postinst	2014-10-10 12:27:35 +0000
+++ debian/maas-region-controller.postinst	2015-01-13 18:02:57 +0000
@@ -41,7 +41,6 @@
 	# enable apache modules needed
 	a2enmod proxy_http
 	a2enmod expires
-	a2enmod wsgi
 }
 
 configure_maas_database() {
@@ -74,8 +73,8 @@
 
 configure_logging() {
 	# Give appropriate permissions
-	if [ ! -f /var/log/maas/maas-django.log ]; then
-		touch /var/log/maas/maas-django.log
+	if [ ! -f /var/log/maas/regiond.log ]; then
+		touch /var/log/maas/regiond.log
 	fi
 	chown -R maas:maas /var/log/maas
 	chmod -R 775 /var/log/maas/oops
@@ -207,6 +206,7 @@
 fi
 
 invoke-rc.d apache2 restart || true
+invoke-rc.d maas-regiond restart || true
 
 if [ -f /etc/init/maas-clusterd.conf ]; then
 	invoke-rc.d maas-clusterd restart || true

=== modified file 'debian/patches/01-fix-database-settings.patch'
--- debian/patches/01-fix-database-settings.patch	2014-11-21 20:25:45 +0000
+++ debian/patches/01-fix-database-settings.patch	2015-01-13 18:02:57 +0000
@@ -1,17 +1,6 @@
 --- a/contrib/maas_local_settings.py
 +++ b/contrib/maas_local_settings.py
-@@ -7,7 +7,7 @@
- DEFAULT_MAAS_URL = "http://maas.internal.example.com/"
- 
- # Absolute path to the directory static files should be collected to.
--STATIC_ROOT = '/var/lib/maas/static/'
-+STATIC_ROOT = '/usr/share/maas/web/static/'
- 
- # Prefix to use for MAAS's urls.
- # If FORCE_SCRIPT_NAME is None (the default), all the urls will start with
-@@ -78,9 +78,9 @@
-     'default': {
-         # 'postgresql_psycopg2', 'postgresql', 'mysql', 'sqlite3' etc.
+@@ -78,5 +78,5 @@
          'ENGINE': 'django.db.backends.postgresql_psycopg2',
 -        'NAME': '',
 -        'USER': '',
@@ -20,5 +9,3 @@
 +        'USER': 'maas',
 +        'PASSWORD': 'maas',
          'HOST': 'localhost',
-     }
- }

=== modified file 'debian/rules'
--- debian/rules	2014-12-17 14:57:43 +0000
+++ debian/rules	2015-01-13 18:02:57 +0000
@@ -10,6 +10,7 @@
 
 override_dh_installinit:
 	dh_installinit --name maas-clusterd
+	dh_installinit --name maas-regiond
 	dh_installinit --name maas-dhcpd
 	dh_installinit --name maas-dhcpd6
 	dh_installinit --name maas-proxy