Merge lp:~rvb/maas/packaging.precise.sru-bug-1085865 into lp:~maas-maintainers/maas/packaging.precise.sru

[Raphaël Badin]

Backport of revision 155.

Backport of the packaging fix https://code.launchpad.net/~rvb/maas/packaging.bug-1085865/+merge/137644.

= Notes =

I upgraded the upstream revision because this fix needs the revision 1325 (which adds the new command 'write_dns_config')

[Gavin Panella (allenap)]

review: Approve

[Julian Edwards (julian-edwards)]

Tarmac is not set up for this branch, I'll do a manual update.

=== modified file 'debian/changelog'
--- debian/changelog	2012-11-22 22:54:28 +0000
+++ debian/changelog	2012-12-04 16:21:27 +0000
@@ -1,6 +1,8 @@
-maas (0.1+bzr1309+dfsg-0ubuntu1) UNRELEASED; urgency=low
+maas (0.1+bzr1325+dfsg-0ubuntu1) UNRELEASED; urgency=low
 
   * New upstream bugfix release. Fixes:
+    - The DNS configuration is not created if maas-dns is installed after
+      the DNS config has been set up (LP: #1085865).
     - IPMI detection ends up with power_address of 0.0.0.0 (LP: #1064224)
     - Main page slow to load with many nodes (LP: #1066775)
     - maas-cluster-controller doesn't have images for provisioning (LP: #1068843)
@@ -23,6 +25,7 @@
     - Error in log when using 'Start node' button: MAASAPINotFound: No user data available for this node. (LP: #1069603)
 
   [ Raphaël Badin ]
+  * debian/maas-dns.postinst: Call write_dns_config (LP: #1085865).
   * debian/maas-dns.postinst: fix permissions and group ownership of
     file /etc/bind/maas/named.conf.rndc.maas. (LP: #1066935)
 

=== modified file 'debian/maas-dns.postinst'
--- debian/maas-dns.postinst	2012-10-19 15:42:58 +0000
+++ debian/maas-dns.postinst	2012-12-04 16:21:27 +0000
@@ -26,6 +26,8 @@
     sed -i '/^include\s.*maas/d' /etc/bind/named.conf.local
     maas get_named_conf --edit --config_path /etc/bind/named.conf.local
 
+    maas write_dns_config
+
     if [ -x /usr/sbin/invoke-rc.d ]; then
         invoke-rc.d bind9 restart || true
     fi