.travis.yml

@@ -1,20 +1,11 @@
 ---
 # This file is managed centrally by modulesync
 #   https://github.com/theforeman/foreman-installer-modulesync
-rvm:
-  - 2.1.9
-  - 2.3.0
-  - 2.4.1
-env:
-  matrix:
-    - PUPPET_VERSION=4.9
 matrix:
   fast_finish: true
   include:
     - rvm: 2.4.1
       env: PUPPET_VERSION=5.0
-    - rvm: 2.5.1
-      env: PUPPET_VERSION=5.0
     - rvm: 2.5.1
       env: PUPPET_VERSION=6.0
     # Acceptance tests
@@ -85,8 +76,4 @@ matrix:
         - sudo service docker restart
 
 bundler_args: --without system_tests development
-before_install:
-  - if [ $TRAVIS_RUBY_VERSION = 2.1.9 ] ; then
-      gem install -v 1.17.3 bundler --no-rdoc --no-ri;
-    fi
-sudo: false
+dist: xenial

CHANGELOG.md

@@ -1,5 +1,22 @@
 # Changelog
 
+## [5.0.0](https://github.com/theforeman/puppet-dhcp/tree/5.0.0) (2019-04-15)
+
+[Full Changelog](https://github.com/theforeman/puppet-dhcp/compare/4.3.0...5.0.0)
+
+**Breaking changes:**
+
+- drop Puppet 4 [\#152](https://github.com/theforeman/puppet-dhcp/pull/152) ([mmoll](https://github.com/mmoll))
+- drop EOL OSes [\#151](https://github.com/theforeman/puppet-dhcp/pull/151) ([mmoll](https://github.com/mmoll))
+
+**Implemented enhancements:**
+
+- Make the config header configurable [\#149](https://github.com/theforeman/puppet-dhcp/pull/149) ([ekohl](https://github.com/ekohl))
+
+**Fixed bugs:**
+
+- fix missing authoritative statement [\#147](https://github.com/theforeman/puppet-dhcp/pull/147) ([qs5779](https://github.com/qs5779))
+
 ## [4.3.0](https://github.com/theforeman/puppet-dhcp/tree/4.3.0) (2019-01-10)
 
 [Full Changelog](https://github.com/theforeman/puppet-dhcp/compare/4.2.0...4.3.0)

Gemfile

@@ -3,7 +3,7 @@
 
 source 'https://rubygems.org'
 
-gem 'puppet', ENV.key?('PUPPET_VERSION') ? "~> #{ENV['PUPPET_VERSION']}" : '>= 4.6'
+gem 'puppet', ENV.key?('PUPPET_VERSION') ? "~> #{ENV['PUPPET_VERSION']}" : '>= 5.5'
 
 gem 'rake'
 gem 'rspec', '~> 3.0'

manifests/init.pp

@@ -36,6 +36,7 @@
   Hash[String, Hash] $pools = {},
   Hash[String, Hash] $hosts = {},
   Variant[Array[String], Optional[String]] $includes = undef,
+  String $config_comment = 'dhcpd.conf',
 ) inherits dhcp::params {
 
   # In case people set interface instead of interfaces work around

metadata.json

@@ -1,6 +1,6 @@
 {
   "name": "theforeman-dhcp",
-  "version": "4.3.0",
+  "version": "5.0.0",
   "author": "theforeman",
   "summary": "Manage the ISC DHCP daemon",
   "license": "Apache-2.0",
@@ -31,7 +31,7 @@
   "requirements": [
     {
       "name": "puppet",
-      "version_requirement": ">= 4.6.1 < 7.0.0"
+      "version_requirement": ">= 5.5.8 < 7.0.0"
     }
   ],
   "operatingsystem_support": [
@@ -72,7 +72,6 @@
     {
       "operatingsystem": "Ubuntu",
       "operatingsystemrelease": [
-        "14.04",
         "16.04",
         "18.04"
       ]
@@ -83,7 +82,6 @@
     {
       "operatingsystem": "FreeBSD",
       "operatingsystemrelease": [
-        "10",
         "11",
         "12"
       ]

spec/classes/init_spec.rb

@@ -32,6 +32,7 @@
             'omapi-port 7911;',
             'default-lease-time 43200;',
             'max-lease-time 86400;',
+            'not authoritative;',
             'ddns-update-style none;',
             'option domain-name "example.com";',
             'option domain-name-servers 8.8.8.8, 8.8.4.4;',
@@ -172,6 +173,7 @@
             'omapi-port 7911;',
             'default-lease-time 43200;',
             'max-lease-time 86400;',
+            'not authoritative;',
             'ddns-updates on;',
             'ddns-update-style interim;',
             'update-static-leases on;',
@@ -204,6 +206,7 @@
           verify_concat_fragment_exact_contents(catalogue, 'dhcp.conf+01_main.dhcp', [
             'default-lease-time 43200;',
             'max-lease-time 86400;',
+            'not authoritative;',
             'ddns-update-style none;',
             'option domain-name "example.com";',
             'option domain-name-servers 8.8.8.8, 8.8.4.4;',
@@ -231,6 +234,7 @@
             'omapi-port 7911;',
             'default-lease-time 43200;',
             'max-lease-time 86400;',
+            'not authoritative;',
             'ddns-update-style none;',
             'option domain-name "example.com";',
             'option domain-name-servers 8.8.8.8, 8.8.4.4;',
@@ -257,6 +261,7 @@
             'omapi-port 7911;',
             'default-lease-time 43200;',
             'max-lease-time 86400;',
+            'not authoritative;',
             'ddns-update-style none;',
             'option domain-name "example.com";',
             'option domain-name-servers 8.8.8.8, 8.8.4.4;',
@@ -284,6 +289,7 @@
             'omapi-port 7911;',
             'default-lease-time 43200;',
             'max-lease-time 86400;',
+            'not authoritative;',
             'ddns-update-style none;',
             'option domain-name "example.com";',
             'option domain-name-servers 8.8.8.8, 8.8.4.4;',
@@ -312,6 +318,7 @@
             'omapi-port 7911;',
             'default-lease-time 43200;',
             'max-lease-time 86400;',
+            'not authoritative;',
             'ddns-update-style none;',
             'option domain-name "example.com";',
             'option domain-name-servers 8.8.8.8, 8.8.4.4;',
@@ -325,6 +332,21 @@
           ])
         }
       end
+
+      describe "with config_comment" do
+        context 'with multiple lines' do
+          let(:overridden_params) do {
+            :config_comment => "first line\nsecond line"
+          } end
+
+          it do
+            verify_concat_fragment_contents(catalogue, 'dhcp.conf+01_main.dhcp', [
+              '# first line',
+              '# second line',
+            ])
+          end
+        end
+      end
     end
   end
 end

templates/dhcpd.conf.erb

@@ -1,4 +1,6 @@
-# dhcpd.conf
+<% @config_comment.split("\n").each do |line| -%>
+<%= "# #{line}" %>
+<% end -%>
 <% if @omapi -%>
 omapi-port 7911;
 <% if @omapi_name && @omapi_key && !@omapi_key.empty? -%>
@@ -17,6 +19,8 @@ max-lease-time <%= @max_lease_time %>;
 # Make the server authoritative for the network segments that
 # are configured, and tell it to send DHCPNAKs to bogus requests
 authoritative;
+<% else %>
+not authoritative;
 <% end -%>
 
 <% if (@dnsupdatekey && !@dnsupdatekey.empty?) || @ddns_updates -%>