Merge lp://qastaging/~andreserl/maas/fix_lp1413388 into lp://qastaging/~maas-maintainers/maas/packaging
Proposed by
Andres Rodriguez
| Status: | Merged |
|---|---|
| Approved by: | Andres Rodriguez |
| Approved revision: | 416 |
| Merged at revision: | 414 |
| Proposed branch: | lp://qastaging/~andreserl/maas/fix_lp1413388 |
| Merge into: | lp://qastaging/~maas-maintainers/maas/packaging |
| Diff against target: |
78 lines (+16/-20) 3 files modified
debian/changelog (+4/-1) debian/maas-dns.postinst (+2/-19) debian/maas-region-controller.postinst (+10/-0) |
| To merge this branch: | bzr merge lp://qastaging/~andreserl/maas/fix_lp1413388 |
| Related bugs: |
| Reviewer | Review Type | Date Requested | Status |
|---|---|---|---|
| Mike Pontillo (community) | Approve | ||
|
Review via email:
|
|||
Commit message
LP: #1413388 Handle upgrades to migrate named.conf.settings
To post a comment you must log in.
Preview Diff
[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
Looks pretty good; a few things need fixing, but since I trust you to fix them I'll mark it approved. ;-)
(1) (applies to all branches) The Python code now checks if the migration needs to happen before unconditionally migrating, so we can move the 'grep' logic out of the packaging. We should remove the 'grep' statements from the maas-dns postinst as well.
(2) I thought we also decided to leave the 'edit_named_