Merge lp:~andreserl/maas/fix_lp1413388 into lp:~maas-maintainers/maas/packaging

[Andres Rodriguez]

LP: #1413388 Handle upgrades to migrate named.conf.settings

[Mike Pontillo (mpontillo)]

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_options' call in the mass-dns postinst for the maas-region-controller-min use case.

review: Approve

[lp:~andreserl/maas/fix_lp1413388]

415. By Andres Rodriguez on 2015-07-07

Address comments

[Mike Pontillo (mpontillo)]

Looks good. Just one comment about an unused variable below.

review: Approve

[lp:~andreserl/maas/fix_lp1413388]

416. By Andres Rodriguez on 2015-07-08

Remove unnecessary variable

=== modified file 'debian/changelog'
--- debian/changelog	2015-07-04 02:22:26 +0000
+++ debian/changelog	2015-07-08 01:12:57 +0000
@@ -7,10 +7,13 @@
   * Drop dependency on python-iscpy: the code has been integrated into
     MAAS. (LP: #1413388).
 
-
   [ Gavin Panella ]
   * Use new local configuration support for the cluster.
 
+  [ Andres Rodriguez ]
+  * Refactor maas-dns upgrade code so it doesn't break local DNS config
+    and it gets migrated (LP: #1413388)
+
  -- Andres Rodriguez <[e-mail]>  Fri, 12 Jun 2015 14:16:47 -0400
 
 maas (1.8.0+bzr4001-0ubuntu1) trusty; urgency=medium
 
=== modified file 'debian/maas-dns.postinst'
--- debian/maas-dns.postinst	2015-07-03 14:26:39 +0000
+++ debian/maas-dns.postinst	2015-07-08 01:12:57 +0000
@@ -52,25 +52,8 @@
     # Fix permissions
     fix_dns_permissions
 
-    # If the /etc/bind/named.conf.options is not set up yet, do it now.
-    # This might happen because of an upgrade from an older package.
-    should_edit_named_options=0
-
-    # If the MAAS include statement doesn't exist in named.conf.local, we need to add it.
-    grep -qs '^include\s.*maas' /etc/bind/named.conf.local || should_edit_named_options=1
-
-    # If the 'forwarders' option exists in named.conf.options, it needs to be removed.
-    grep -qs "forwarders" /etc/bind/named.conf.options && should_edit_named_options=1
-
-    # If the 'dnssec-validation' option exists in named.conf.options, it needs to be removed.
-    grep -qs "dnssec-validation" /etc/bind/named.conf.options && should_edit_named_options=1
-
-    # If the include file for the custom MAAS named.conf.options doesn't exist, it needs to be added.
-    grep -qs "named.conf.options.inside.maas" /etc/bind/named.conf.options || should_edit_named_options=1
-
-    if [ $should_edit_named_options -eq 1 ]; then
-        edit_named_options
-    fi
+    # ensure that DNS config is included
+    edit_named_options
 fi
 
 invoke-rc.d bind9 restart || true
 
=== modified file 'debian/maas-region-controller.postinst'
--- debian/maas-region-controller.postinst	2015-07-03 14:26:39 +0000
+++ debian/maas-region-controller.postinst	2015-07-08 01:12:57 +0000
@@ -44,6 +44,15 @@
     grep "^DEFAULT_MAAS_URL" "$1" | cut -d"/" -f3
 }
 
+configure_migrate_maas_dns() {
+    # This only runs on upgrade. We only run this if the
+    # there are forwarders to migrate or no
+    # named.conf.options.inside.maas are present.
+    maas-region-admin edit_named_options \
+        --migrate-conflicting-options --config-path \
+        /etc/bind/named.conf.options
+    invoke-rc.d bind9 restart || true
+}
 
 if [ "$1" = "configure" ] && [ -z "$2" ]; then
     #########################################################
@@ -137,6 +146,7 @@
 
     maas_sync_migrate_db
 
+    configure_migrate_maas_dns
 fi
 
 invoke-rc.d maas-regiond restart || true