Merge lp:~andreserl/maas/fix_lp1413388_1.8 into lp:~maas-maintainers/maas/packaging-1.8

[Andres Rodriguez]

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

[lp:~andreserl/maas/fix_lp1413388_1.8]

411. By Andres Rodriguez on 2015-07-07

Address Mike's comments

[Mike Pontillo (mpontillo)]

LGTM!

review: Approve

=== modified file 'debian/changelog'
--- debian/changelog	2015-07-01 08:07:14 +0000
+++ debian/changelog	2015-07-07 21:45:27 +0000
@@ -1,12 +1,20 @@
-maas (1.8.0+bzr4001-0ubuntu1) trusty; urgency=medium
-
-  * New upstream release, 1.8.0.
+maas (1.8.0+bzr4016-0ubuntu1) UNRELEASED; urgency=medium
 
   [ Raphaël Badin ]
   * Enable proxy_wstunnel module.
   * Drop dependency on python-iscpy: the code has been integrated into
     MAAS. (LP: #1413388).
 
+  [ 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]>  Mon, 06 Jul 2015 23:52:59 -0400
+
+maas (1.8.0+bzr4001-0ubuntu1) trusty; urgency=medium
+
+  * New upstream release, 1.8.0.
+
  -- Andres Rodriguez <[e-mail]>  Tue, 09 Jun 2015 20:57:42 -0400
 
 maas (1.8.0~rc3+bzr4000-0ubuntu1) trusty; urgency=medium
 
=== modified file 'debian/maas-dns.postinst'
--- debian/maas-dns.postinst	2015-04-29 07:57:12 +0000
+++ debian/maas-dns.postinst	2015-07-07 21:45:27 +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-04-08 22:14:39 +0000
+++ debian/maas-region-controller.postinst	2015-07-07 21:45:27 +0000
@@ -49,6 +49,15 @@
         echo $ipaddr
 }
 
+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
 	#########################################################
@@ -133,6 +142,7 @@
 
 	maas_sync_migrate_db
 
+	configure_migrate_maas_dns
 fi
 
 invoke-rc.d maas-regiond restart || true