Merge ~bjornt/maas:bug-1908087-disable-empty-zones into maas:master

Proposed by Björn Tillenius
Status: Merged
Approved by: Björn Tillenius
Approved revision: b0330dd3488d06ae835b31155692b4b46e5c0d6a
Merge reported by: MAAS Lander
Merged at revision: not available
Proposed branch: ~bjornt/maas:bug-1908087-disable-empty-zones
Merge into: maas:master
Diff against target: 34 lines (+2/-3)
2 files modified
src/provisioningserver/dns/tests/test_actions.py (+1/-2)
src/provisioningserver/templates/dns/named.conf.options.inside.maas.template (+1/-1)
Reviewer Review Type Date Requested Status
Alberto Donato Approve
MAAS Lander unittests Pending
Review via email: mp+398953@code.launchpad.net

Commit message

LP #1908087 - Reverse DNS for non-maas RFC1918 zones fails inside maas

Considering MAAS is usually configured to point to another DNS within a
DC, having empty-zones-enable set to 'no' makes the most sense.
Especially since that was the behaviour in bind9 before MAAS 2.9.

In the future we might want to make this optional.

To post a comment you must log in.
Revision history for this message
Alberto Donato (ack) wrote :

+1

review: Approve

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1diff --git a/src/provisioningserver/dns/tests/test_actions.py b/src/provisioningserver/dns/tests/test_actions.py
2index 3aae795..72c5b5a 100644
3--- a/src/provisioningserver/dns/tests/test_actions.py
4+++ b/src/provisioningserver/dns/tests/test_actions.py
5@@ -258,7 +258,7 @@ class TestConfiguration(MAASTestCase):
6 };
7
8 dnssec-validation %s;
9-
10+ empty-zones-enable no;
11 allow-query { any; };
12 allow-recursion { trusted; };
13 allow-query-cache { trusted; };
14@@ -267,7 +267,6 @@ class TestConfiguration(MAASTestCase):
15 expected_options_content %= tuple(upstream_dns) + (
16 expected_dnssec_validation,
17 )
18-
19 self.assertThat(
20 expected_options_file, FileContains(expected_options_content)
21 )
22diff --git a/src/provisioningserver/templates/dns/named.conf.options.inside.maas.template b/src/provisioningserver/templates/dns/named.conf.options.inside.maas.template
23index ba1aee3..d76fcfa 100644
24--- a/src/provisioningserver/templates/dns/named.conf.options.inside.maas.template
25+++ b/src/provisioningserver/templates/dns/named.conf.options.inside.maas.template
26@@ -7,7 +7,7 @@ forwarders {
27 {{endif}}
28
29 dnssec-validation {{dnssec_validation}};
30-
31+empty-zones-enable no;
32
33 {{if not upstream_allow_query}}
34 allow-query { any; };

Subscribers

People subscribed via source and target branches