.fixtures.yml

@@ -3,7 +3,3 @@ fixtures:
     concat:      'https://github.com/puppetlabs/puppetlabs-concat'
     stdlib:      'https://github.com/puppetlabs/puppetlabs-stdlib.git'
     systemd:     'https://github.com/camptocamp/puppet-systemd'
-
-  symlinks:
-    dhcp: "#{source_dir}"
-    test_module: "#{source_dir}/spec/static_fixtures/test_module"

.sync.yml

@@ -1,9 +1,9 @@
 ---
 .travis.yml:
   beaker_sets:
-    - docker/centos-7
-    - docker/debian-8
-    - docker/debian-9
+    - centos7-64
+    - debian8-64
+    - debian9-64
 .puppet-lint.rc:
   extra_disabled_lint_checks:
     - 'documentation'

.travis.yml

@@ -3,7 +3,6 @@
 #   https://github.com/theforeman/foreman-installer-modulesync
 rvm:
   - 2.1.9
-  - 2.2.6
   - 2.3.0
   - 2.4.1
 env:
@@ -14,22 +13,24 @@ matrix:
   include:
     - rvm: 2.4.1
       env: PUPPET_VERSION=5.0
+    - rvm: 2.5.1
+      env: PUPPET_VERSION=5.0
     # Acceptance tests
-    - rvm: 2.3.1
+    - rvm: 2.5.1
       dist: trusty
-      env: PUPPET_INSTALL_TYPE=agent BEAKER_debug=true BEAKER_set=docker/centos-7
+      env: PUPPET_INSTALL_TYPE=agent BEAKER_IS_PE=no BEAKER_PUPPET_COLLECTION=puppet5 BEAKER_debug=true BEAKER_setfile=centos7-64{hypervisor=docker\,hostname=centos7-64.example.com}
       script: bundle exec rake beaker
       services: docker
       bundler_args: --without development
-    - rvm: 2.3.1
+    - rvm: 2.5.1
       dist: trusty
-      env: PUPPET_INSTALL_TYPE=agent BEAKER_debug=true BEAKER_set=docker/debian-8
+      env: PUPPET_INSTALL_TYPE=agent BEAKER_IS_PE=no BEAKER_PUPPET_COLLECTION=puppet5 BEAKER_debug=true BEAKER_setfile=debian8-64{hypervisor=docker\,hostname=debian8-64.example.com}
       script: bundle exec rake beaker
       services: docker
       bundler_args: --without development
-    - rvm: 2.3.1
+    - rvm: 2.5.1
       dist: trusty
-      env: PUPPET_INSTALL_TYPE=agent BEAKER_debug=true BEAKER_set=docker/debian-9
+      env: PUPPET_INSTALL_TYPE=agent BEAKER_IS_PE=no BEAKER_PUPPET_COLLECTION=puppet5 BEAKER_debug=true BEAKER_setfile=debian9-64{hypervisor=docker\,hostname=debian9-64.example.com}
       script: bundle exec rake beaker
       services: docker
       bundler_args: --without development

CHANGELOG.md

@@ -1,5 +1,20 @@
 # Changelog
 
+## [4.2.0](https://github.com/theforeman/puppet-dhcp/tree/4.2.0) (2018-10-04)
+
+[Full Changelog](https://github.com/theforeman/puppet-dhcp/compare/4.1.1...4.2.0)
+
+**Implemented enhancements:**
+
+- Support Ubuntu/bionic, remove Debian 7 & Fedora 25 [\#127](https://github.com/theforeman/puppet-dhcp/pull/127) ([mmoll](https://github.com/mmoll))
+- make ddns-update-style adjustable [\#126](https://github.com/theforeman/puppet-dhcp/pull/126) ([zeromind](https://github.com/zeromind))
+
+**Merged pull requests:**
+
+- allow puppetlabs-stdlib 5.x [\#135](https://github.com/theforeman/puppet-dhcp/pull/135) ([mmoll](https://github.com/mmoll))
+- allow puppetlabs-concat 5.x [\#134](https://github.com/theforeman/puppet-dhcp/pull/134) ([mmoll](https://github.com/mmoll))
+- Mark compatible with camptocamp-systemd 2.0 [\#131](https://github.com/theforeman/puppet-dhcp/pull/131) ([mateusz-gozdek-sociomantic](https://github.com/mateusz-gozdek-sociomantic))
+
 ## 4.1.1
 
 * Correct listening on EL7 when using `$interface`
@@ -95,3 +110,6 @@
 ## 1.3.1
 * Change Debian package name to prevent reinstallation on each run
 * Fix puppet-lint issues
+
+
+\* *This Changelog was automatically generated by [github_changelog_generator](https://github.com/skywinder/Github-Changelog-Generator)*

Gemfile

@@ -26,8 +26,12 @@ gem 'puppet-lint-unquoted_string-check'
 gem 'puppet-lint-variable_contains_upcase'
 gem 'puppet-lint-version_comparison-check'
 gem 'simplecov'
+gem 'github_changelog_generator', {"git"=>"https://github.com/skywinder/github-changelog-generator", "ref"=>"20ee04ba1234e9e83eb2ffb5056e23d641c7a018", "groups"=>["development"]}
 gem 'puppet-blacksmith', '>= 4.1.0', {"groups"=>["development"]}
-gem 'beaker', '>= 3.9.0', {"groups"=>["system_tests"]}
+gem 'beaker', '>= 4.0.0', {"groups"=>["system_tests"]}
+gem 'beaker-docker', {"groups"=>["system_tests"]}
+gem 'beaker-hostgenerator', '>= 1.1.10', {"groups"=>["system_tests"]}
+gem 'beaker-puppet', {"groups"=>["system_tests"]}
 gem 'beaker-rspec', {"groups"=>["system_tests"]}
 gem 'beaker-module_install_helper', {"groups"=>["system_tests"]}
 gem 'beaker-puppet_install_helper', {"groups"=>["system_tests"]}

HISTORY.md

@@ -0,0 +1,95 @@
+## 4.1.1
+
+* Correct listening on EL7 when using `$interface`
+
+## 4.1.0
+
+* Make the OMAPI algorithm configurable
+* Drop EOL operating systems and add new ones to metadata.json
+
+## 4.0.2
+* Fix listen on interfaces in EL7
+* Add validation for the DHCP range
+
+## 4.0.1
+* Validate parameters using Puppet 4 types
+
+## 4.0.0
+* Drop Puppet 3 support
+* Add `$omapi`, so OMAPI can be turned off
+* Add `$bootp`, so BOOTP can be turned off
+* Improve failover logic
+
+## 3.1.0
+* Add `$ddns_updates` parameter to allow insecure DDNS updates.
+* Add `$pxefilename` parameter to `dhcp::pool`.
+* Add `$raw_prepend` and `$raw_append` parameters to `dhcp::pool`.
+* Fix classless static routes.
+
+## 3.0.0
+* Add bootfiles parameter with hash of client architectures to boot
+  loaders used for "filename", defaulting to "pxelinux.0" (#14920)
+* Add mtu parameter to main class and to dhcp::pool
+* Add Arch Linux support
+* Drop support for Ruby 1.8.7
+* Many improvements to tests
+
+## 2.3.2
+* Fix metadata to show Puppet 4 compatibility
+* Remove hashes around pool names for Webmin compatibility
+
+## 2.3.1
+* Fix domain-search syntax for multiple search domains (#70)
+* Update FreeBSD package name for ISC DHCP 4.3
+
+## 2.3.0
+* Add dhcp::failover class to configure DHCP failover between servers
+* Add includes parameter to include other config files
+* Handle and ignore an empty omapi_key parameter
+* Add tests for dhcp::dhcp_class
+* Support Puppet 3.0 minimum
+* Support Fedora 21, remove Debian 6 (Squeeze)
+
+## 2.2.0
+* Add pools, hosts parameters to dhcp to automatically create dhcp::pool
+  and dhcp::host resources, usable from Hiera and Foreman
+* Add ddns_domainname and ddns_rev_domainname parameters to dhcp
+* Add ntpservers parameter to dhcp
+* Permit the dhcp::pool range parameter to be an array of ranges
+
+## 2.1.0
+* Support configuration on FreeBSD
+* Add options parameter for arbitrary options
+* Add dhcp::class define to add new DHCP class definitions
+* Add pool_parameters param to dhcp::pool for allow statements etc.
+* Add authoritative parameter
+* Add search_domains parameter to dhcp::pool
+* Add omapi_name/omapi_key parameters
+
+## 2.0.0
+* Add parameters to dhcp and dhcp:pool to configure static routes
+* Change theforeman-concat_native to puppetlabs-concat
+* Fix quoting of domain-name option
+* Test with future parser and Puppet 4
+
+## 1.6.0
+* Add `parameters`, `options` parameters to dhcp::pool
+* Add `default_lease_time`, `max_lease_time` parameters to dhcp
+* Use longer ISC defaults for lease times
+* Minimising differences to puppetlabs/dhcp for eventual merger
+* Do not set domain-name option if dnsdomain parameter is empty
+* Strip pool config values before checking if they should be set
+* Removing unused code, tidyups, better test coverage, increased linting
+
+## 1.5.0
+* Add nameservers parameter to dhcp::pool
+* Fix config output when empty pool range is passed
+
+## 1.4.0
+* Add pxeserver parameter to dhcp::pool
+* Unsetting pxeserver/pxefilename disables PXE in a subnet
+* Add tests, fix lint and style issues
+
+## 1.3.1
+* Change Debian package name to prevent reinstallation on each run
+* Fix puppet-lint issues

Rakefile

@@ -15,6 +15,31 @@ begin
 rescue LoadError
 end
 
+begin
+  require 'github_changelog_generator/task'
+
+  # https://github.com/github-changelog-generator/github-changelog-generator/issues/313
+  module GitHubChangelogGeneratorExtensions
+    def compound_changelog
+      super.gsub(/(fixes|fixing|refs) \\#(\d+)/i, '\1 [\\#\2](https://projects.theforeman.org/issues/\2)')
+    end
+  end
+
+  class GitHubChangelogGenerator::Generator
+    prepend GitHubChangelogGeneratorExtensions
+  end
+
+  GitHubChangelogGenerator::RakeTask.new :changelog do |config|
+    raise "Set CHANGELOG_GITHUB_TOKEN environment variable eg 'export CHANGELOG_GITHUB_TOKEN=valid_token_here'" if Rake.application.top_level_tasks.include? "changelog" and ENV['CHANGELOG_GITHUB_TOKEN'].nil?
+    metadata = JSON.load(File.read('metadata.json'))
+    config.user = 'theforeman'
+    config.project = "puppet-#{metadata['name'].split('-').last}"
+    config.future_release = metadata['version']
+    config.exclude_labels = ['duplicate', 'question', 'invalid', 'wontfix', 'Modulesync', 'skip-changelog']
+  end
+rescue LoadError
+end
+
 PuppetLint.configuration.ignore_paths = ["spec/**/*.pp", "pkg/**/*.pp", "vendor/**/*.pp"]
 PuppetLint.configuration.log_format = '%{path}:%{line}:%{KIND}: %{message}'
 

manifests/init.pp

@@ -29,8 +29,9 @@
   Boolean $authoritative = false,
   String $dhcp_root_group = $dhcp::params::root_group,
   Boolean $ddns_updates = false,
-  Optional[String] $ddns_domainname    = undef,
-  Optional[String] $ddns_rev_domainname= undef,
+  Optional[String] $ddns_domainname = undef,
+  Optional[String] $ddns_rev_domainname = undef,
+  Enum['none', 'interim', 'standard'] $ddns_update_style = 'interim',
   Hash[String, Hash] $pools = {},
   Hash[String, Hash] $hosts = {},
   Variant[Array[String], Optional[String]] $includes = undef,

metadata.json

@@ -1,6 +1,6 @@
 {
   "name": "theforeman-dhcp",
-  "version": "4.1.1",
+  "version": "4.2.0",
   "author": "theforeman",
   "summary": "Manage the ISC DHCP daemon",
   "license": "Apache-2.0",
@@ -17,15 +17,15 @@
   "dependencies": [
     {
       "name": "camptocamp/systemd",
-      "version_requirement": ">= 1.0.0 < 2.0.0"
+      "version_requirement": ">= 1.0.0 < 3.0.0"
     },
     {
       "name": "puppetlabs/concat",
-      "version_requirement": ">= 1.0.0 < 5.0.0"
+      "version_requirement": ">= 1.0.0 < 6.0.0"
     },
     {
       "name": "puppetlabs/stdlib",
-      "version_requirement": ">= 4.13.0 < 5.0.0"
+      "version_requirement": ">= 4.13.0 < 6.0.0"
     }
   ],
   "requirements": [
@@ -59,14 +59,12 @@
     {
       "operatingsystem": "Fedora",
       "operatingsystemrelease": [
-        "25",
         "26"
       ]
     },
     {
       "operatingsystem": "Debian",
       "operatingsystemrelease": [
-        "7",
         "8",
         "9"
       ]
@@ -75,7 +73,8 @@
       "operatingsystem": "Ubuntu",
       "operatingsystemrelease": [
         "14.04",
-        "16.04"
+        "16.04",
+        "18.04"
       ]
     },
     {