Merge into packaging : packaging.regiond : Code : MAAS

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

Proposed by Gavin Panella
Status: Merged
Approved by: Gavin Panella
Approved revision: 351
Merged at revision: 339
Proposed branch: lp://staging/~allenap/maas/packaging.regiond
Merge into: lp://staging/~maas-maintainers/maas/packaging
Prerequisite: lp://staging/~allenap/maas/packaging.rename-scripts-and-prepare-for-twistd-in-region
Diff against target: 297 lines (+80/-53)
11 files modified
To merge this branch: bzr merge lp://staging/~allenap/maas/packaging.regiond
Reviewer Review Type Date Requested Status
Andres Rodriguez (community) Approve
Review via email: mp+241003@code.staging.launchpad.net

Commit message

Packaging for maas-regiond.

Description of the change

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.

To post a comment you must log in.
346. By Gavin Panella

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

347. By Gavin Panella

STATIC_ROOT no longer needs patching.

Revision history for this message
Andres Rodriguez (andreserl) wrote :

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
348. By Gavin Panella

Merge trunk.

349. By Gavin Panella

Fix-up changelog.

350. By Gavin Panella

Increase log file rotation threshold to 10MB.

351. By Gavin Panella

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

Revision history for this message
Gavin Panella (allenap) wrote :

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

Revision history for this message
Andres Rodriguez (andreserl) wrote :

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

Preview Diff

Failed to fetch available diffs.

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
The diff is not available at this time. You can reload the page or download it.

Subscribers

People subscribed via source and target branches