Remove explicit 'none' pseudo update policy

theforeman · Apr 30, 2020 · 194bb11 · 194bb11
1 parent 92d1e38
commit 194bb11
Show file tree

Hide file tree

Showing 3 changed files with 2 additions and 19 deletions.
diff --git a/spec/defines/dns_zone_spec.rb b/spec/defines/dns_zone_spec.rb
@@ -398,21 +398,6 @@
         ])
         end
       end
-
-      context 'update_policy set to none' do
-        let(:params) { {
-          :update_policy => 'none',
-        } }
-
-        it "should have valid zone configuration" do
-          verify_concat_fragment_exact_contents(catalogue, 'dns_zones+10__GLOBAL__example.com.dns', [
-          'zone "example.com" {',
-          '    type master;',
-          "    file \"#{zonefilepath}/db.example.com\";",
-          '};',
-        ])
-        end
-      end
     end
   end
 end
diff --git a/templates/named.zone.erb b/templates/named.zone.erb
@@ -11,10 +11,8 @@ zone "<%= @zone %>" {
 <% end -%>
 <% if @zonetype == 'master' -%>
 <%   if @update_policy.is_a? String -%>
-<%     if @update_policy != 'none' -%>
     update-policy <%= @update_policy %>;
-<%     end -%>
-<%   else -%>
+<%   elsif @update_policy -%>
     update-policy {
             <%- @update_policy.sort_by {|k, v| k}.each do |key, key_hash| -%>
             <%= key_hash['action'] || 'grant' %> <%= key %> <%= key_hash['matchtype'] %> <% if key_hash['tname'] %><%= key_hash['tname'] %> <% end %><%= key_hash['rr'] %>;

diff --git a/types/updatepolicy.pp b/types/updatepolicy.pp
@@ -1,6 +1,6 @@
 # Validate update-policy parameter
 type Dns::UpdatePolicy = Variant[
-  Enum['none', 'local'],
+  Enum['local'],
   Hash[
     String,
     Struct[{