.gitignore

@@ -36,6 +36,7 @@ junit/
 pkg/
 coverage/
 .yardoc/
+REFERENCE.md
 
 ## InteliJ / RubyMine
 .idea

.sync.yml

@@ -3,9 +3,10 @@
   beaker_sets:
     - centos6-64
     - centos7-64
+    - centos8-64
     - debian8-64
     - debian9-64
     - debian10-64
-Rakefile:
-  param_docs_pattern:
-    - manifests/init.pp
+    - fedora31-64
+    - ubuntu1604-64
+    - ubuntu1804-64

.travis.yml

@@ -53,6 +53,28 @@ matrix:
         - echo '{"ipv6":true,"fixed-cidr-v6":"2001:db8:1::/64"}' | sudo tee /etc/docker/daemon.json
         - sudo service docker restart
 
+    - rvm: 2.5.1
+      env:
+        - BEAKER_PUPPET_COLLECTION=puppet5
+        - BEAKER_setfile=centos8-64{hostname=centos8-64.example.com}
+      script: bundle exec rake beaker
+      services: docker
+      bundler_args: --without development
+      before_install:
+        - echo '{"ipv6":true,"fixed-cidr-v6":"2001:db8:1::/64"}' | sudo tee /etc/docker/daemon.json
+        - sudo service docker restart
+
+    - rvm: 2.5.1
+      env:
+        - BEAKER_PUPPET_COLLECTION=puppet6
+        - BEAKER_setfile=centos8-64{hostname=centos8-64.example.com}
+      script: bundle exec rake beaker
+      services: docker
+      bundler_args: --without development
+      before_install:
+        - echo '{"ipv6":true,"fixed-cidr-v6":"2001:db8:1::/64"}' | sudo tee /etc/docker/daemon.json
+        - sudo service docker restart
+
     - rvm: 2.5.1
       env:
         - BEAKER_PUPPET_COLLECTION=puppet5
@@ -119,5 +141,71 @@ matrix:
         - echo '{"ipv6":true,"fixed-cidr-v6":"2001:db8:1::/64"}' | sudo tee /etc/docker/daemon.json
         - sudo service docker restart
 
+    - rvm: 2.5.1
+      env:
+        - BEAKER_PUPPET_COLLECTION=puppet5
+        - BEAKER_setfile=fedora31-64{hostname=fedora31-64.example.com}
+      script: bundle exec rake beaker
+      services: docker
+      bundler_args: --without development
+      before_install:
+        - echo '{"ipv6":true,"fixed-cidr-v6":"2001:db8:1::/64"}' | sudo tee /etc/docker/daemon.json
+        - sudo service docker restart
+
+    - rvm: 2.5.1
+      env:
+        - BEAKER_PUPPET_COLLECTION=puppet6
+        - BEAKER_setfile=fedora31-64{hostname=fedora31-64.example.com}
+      script: bundle exec rake beaker
+      services: docker
+      bundler_args: --without development
+      before_install:
+        - echo '{"ipv6":true,"fixed-cidr-v6":"2001:db8:1::/64"}' | sudo tee /etc/docker/daemon.json
+        - sudo service docker restart
+
+    - rvm: 2.5.1
+      env:
+        - BEAKER_PUPPET_COLLECTION=puppet5
+        - BEAKER_setfile=ubuntu1604-64{hostname=ubuntu1604-64.example.com}
+      script: bundle exec rake beaker
+      services: docker
+      bundler_args: --without development
+      before_install:
+        - echo '{"ipv6":true,"fixed-cidr-v6":"2001:db8:1::/64"}' | sudo tee /etc/docker/daemon.json
+        - sudo service docker restart
+
+    - rvm: 2.5.1
+      env:
+        - BEAKER_PUPPET_COLLECTION=puppet6
+        - BEAKER_setfile=ubuntu1604-64{hostname=ubuntu1604-64.example.com}
+      script: bundle exec rake beaker
+      services: docker
+      bundler_args: --without development
+      before_install:
+        - echo '{"ipv6":true,"fixed-cidr-v6":"2001:db8:1::/64"}' | sudo tee /etc/docker/daemon.json
+        - sudo service docker restart
+
+    - rvm: 2.5.1
+      env:
+        - BEAKER_PUPPET_COLLECTION=puppet5
+        - BEAKER_setfile=ubuntu1804-64{hostname=ubuntu1804-64.example.com}
+      script: bundle exec rake beaker
+      services: docker
+      bundler_args: --without development
+      before_install:
+        - echo '{"ipv6":true,"fixed-cidr-v6":"2001:db8:1::/64"}' | sudo tee /etc/docker/daemon.json
+        - sudo service docker restart
+
+    - rvm: 2.5.1
+      env:
+        - BEAKER_PUPPET_COLLECTION=puppet6
+        - BEAKER_setfile=ubuntu1804-64{hostname=ubuntu1804-64.example.com}
+      script: bundle exec rake beaker
+      services: docker
+      bundler_args: --without development
+      before_install:
+        - echo '{"ipv6":true,"fixed-cidr-v6":"2001:db8:1::/64"}' | sudo tee /etc/docker/daemon.json
+        - sudo service docker restart
+
 bundler_args: --without system_tests development
 dist: xenial

CHANGELOG.md

@@ -1,5 +1,17 @@
 # Changelog
 
+## [6.0.0](https://github.com/theforeman/puppet-tftp/tree/6.0.0) (2020-05-12)
+
+[Full Changelog](https://github.com/theforeman/puppet-tftp/compare/5.0.2...6.0.0)
+
+**Breaking changes:**
+
+- Use modern facts [\#107](https://github.com/theforeman/puppet-tftp/issues/107)
+
+**Implemented enhancements:**
+
+- Add EL8 & Fedora 31, drop Fedora 26 [\#98](https://github.com/theforeman/puppet-tftp/pull/98) ([ekohl](https://github.com/ekohl))
+
 ## [5.0.2](https://github.com/theforeman/puppet-tftp/tree/5.0.2) (2020-02-11)
 
 [Full Changelog](https://github.com/theforeman/puppet-tftp/compare/5.0.1...5.0.2)

CONTRIBUTING.md

@@ -135,12 +135,22 @@ Our puppet modules provide [`Gemfile`](./Gemfile)s which can tell a ruby
 package manager such as [bundler](https://bundler.io/) what Ruby packages,
 or Gems, are required to build, develop, and test this software.
 
-Please make sure you have [bundler installed](https://bundler.io/#getting-started)
-on your system, then use it to install all dependencies needed for this project,
-by running
-
-```shell
-% bundle install
+**Prerequisites**
+1. Make sure you have [bundler installed](https://bundler.io/#getting-started)
+on your system. If you are using Fedora, you can get `bundler` using
+   ```shell
+   sudo dnf install rubygem-bundler
+   ```
+2. If you are using Fedora, you may need these additional packages
+   ```shell
+   sudo dnf install -y ruby-devel redhat-rpm-config
+   ```
+
+Now, go to the root directory of this project and use `bundler` to install all
+dependencies needed for this project by running
+
+```console
+$ bundle install
 Fetching gem metadata from https://rubygems.org/........
 Fetching gem metadata from https://rubygems.org/..
 Using rake (10.1.0)
@@ -159,21 +169,43 @@ NOTE some systems may require you to run this command with sudo.
 If you already have those gems installed, make sure they are up-to-date:
 
 ```shell
-% bundle update
+bundle update
 ```
 
 With all dependencies in place and up-to-date we can now run the tests:
 
 ```shell
-% rake spec
+rake spec
 ```
 
-This will execute all the [rspec tests](http://rspec-puppet.com/) tests
-under [spec/defines](./spec/defines), [spec/classes](./spec/classes),
-and so on. rspec tests may have the same kind of dependencies as the
-module they are testing. While the module defines in its [Modulefile](./Modulefile),
+This will execute all the [rspec tests](http://rspec-puppet.com/) tests under
+[spec/defines](./spec/defines), [spec/classes](./spec/classes), and so on.
+rspec tests may have the same kind of dependencies as the module they are
+testing. While the module defines in its [metadata.json](./metadata.json),
 rspec tests define them in [.fixtures.yml](./fixtures.yml).
 
+To run specific tests, use the spec test file name and a filter like:
+
+```shell
+bundle exec rspec spec/classes/foreman_spec.rb -e 'should restart passenger'
+```
+More filter info available [here](https://relishapp.com/rspec/rspec-core/v/3-9/docs/command-line/example-option)
+
+To run OS specific tests:
+
+```shell
+SPEC_FACTS_OS=redhat-7-x86_64 bundle exec rspec spec/classes/foreman_spec.rb
+```
+
+If you have more than one version of `redhat` OS specified in metadata.json,
+you can run them all like:
+
+```shell
+SPEC_FACTS_OS=redhat bundle exec rspec spec/classes/foreman_spec.rb
+```
+For more information on running the tests, see [rspec-puppet-facts](https://github.com/mcanevet/rspec-puppet-facts)
+and specifically the [section for running tests](https://github.com/mcanevet/rspec-puppet-facts#running-your-tests).
+
 Writing Tests
 -------------
 
@@ -246,3 +278,13 @@ Additional Resources
 
 * [GitHub pull request documentation](https://help.github.com/send-pull-requests/)
 
+
+Modulesync
+==========
+
+Various files, including this one, are
+[modulesynced](https://github.com/voxpupuli/modulesync) using
+[foreman-installer-modulesync](https://github.com/theforeman/foreman-installer-modulesync)
+configuration. Changes should be made over there and then synced to
+all [managed
+modules](https://github.com/theforeman/foreman-installer-modulesync/blob/master/managed_modules.yml).

Gemfile

@@ -5,36 +5,16 @@ source 'https://rubygems.org'
 
 gem 'puppet', ENV.key?('PUPPET_VERSION') ? "~> #{ENV['PUPPET_VERSION']}" : '>= 5.5'
 
-gem 'rake'
-gem 'rspec', '~> 3.0'
-gem 'rspec-puppet', '~> 2.3'
-gem 'rspec-puppet-facts', '>= 1.7'
-gem 'puppetlabs_spec_helper', '>= 2.1.1'
-gem 'puppet-lint', '>= 2'
-gem 'puppet-lint-classes_and_types_beginning_with_digits-check'
+gem 'kafo_module_lint'
 gem 'puppet-lint-empty_string-check'
 gem 'puppet-lint-file_ensure-check'
-gem 'puppet-lint-leading_zero-check'
 gem 'puppet-lint-param-docs', '>= 1.3.0'
 gem 'puppet-lint-spaceship_operator_without_tag-check'
 gem 'puppet-lint-strict_indent-check'
-gem 'puppet-lint-trailing_comma-check'
 gem 'puppet-lint-undef_in_function-check'
-gem 'puppet-lint-unquoted_string-check'
-gem 'puppet-lint-variable_contains_upcase'
-gem 'puppet-lint-version_comparison-check'
-gem 'simplecov'
-gem 'github_changelog_generator', '>= 1.15.0'
-gem 'puppet-blacksmith', '>= 4.1.0', {"groups"=>["development"]}
-gem 'beaker', '>= 4.2.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"]}
-gem 'metadata-json-lint'
-gem 'kafo_module_lint'
-gem 'parallel_tests'
+gem 'voxpupuli-test', '~> 1.4'
+gem 'github_changelog_generator', '>= 1.15.0', {"groups"=>["development"]}
+gem 'puppet-blacksmith', '>= 6.0.0', {"groups"=>["development"]}
+gem 'voxpupuli-acceptance', '~> 0.2', {"groups"=>["system_tests"]}
 
 # vim:ft=ruby

Rakefile

@@ -1,8 +1,10 @@
 # This file is managed centrally by modulesync
 #   https://github.com/theforeman/foreman-installer-modulesync
 
-require 'puppetlabs_spec_helper/rake_tasks'
-require 'puppet-lint/tasks/puppet-lint'
+require 'voxpupuli/test/rake'
+
+# We use fixtures in our modules, which is not the default
+task :beaker => 'spec_prep'
 
 # blacksmith isn't always present, e.g. on Travis with --without development
 begin
@@ -39,18 +41,3 @@ begin
   end
 rescue LoadError
 end
-
-PuppetLint.configuration.ignore_paths = ["spec/**/*.pp", "pkg/**/*.pp", "vendor/**/*.pp"]
-PuppetLint.configuration.log_format = '%{path}:%{line}:%{KIND}: %{message}'
-
-require 'puppet-lint-param-docs/tasks'
-PuppetLintParamDocs.define_selective do |config|
-  config.pattern = ["manifests/init.pp"]
-end
-
-require 'kafo_module_lint/tasks'
-KafoModuleLint::RakeTask.new do |config|
-  config.pattern = ["manifests/init.pp"]
-end
-
-task :default => [:release_checks]

data/CentOS-6.yaml

@@ -0,0 +1,2 @@
+---
+tftp::daemon: false

data/CentOS-7.yaml

@@ -0,0 +1,2 @@
+---
+tftp::daemon: false

data/RedHat-5.yaml

@@ -1,2 +1,3 @@
 ---
 tftp::root: "/tftpboot"
+tftp::daemon: false

data/RedHat-6.yaml

@@ -0,0 +1,2 @@
+---
+tftp::daemon: false

data/RedHat-7.yaml

@@ -0,0 +1,2 @@
+---
+tftp::daemon: false

data/RedHat.yaml

@@ -1,5 +1,5 @@
 ---
-tftp::daemon: false
+tftp::daemon: true
 tftp::service: tftp.socket
 tftp::package: tftp-server
 tftp::root: "/var/lib/tftpboot"

data/Scientific-6.yaml

@@ -0,0 +1,2 @@
+---
+tftp::daemon: false

data/Scientific-7.yaml

@@ -0,0 +1,2 @@
+---
+tftp::daemon: false

manifests/config.pp

@@ -6,7 +6,7 @@
   }
 
   if $tftp::daemon {
-    if $facts['osfamily'] =~ /^(FreeBSD|DragonFly)$/ {
+    if $facts['os']['family'] =~ /^(FreeBSD|DragonFly)$/ {
       augeas { 'set root directory':
         context => '/files/etc/rc.conf',
         changes => "set tftpd_flags '\"-s ${tftp::root}\"'",

metadata.json

@@ -1,6 +1,6 @@
 {
   "name": "theforeman-tftp",
-  "version": "5.0.2",
+  "version": "6.0.0",
   "author": "theforeman",
   "summary": "TFTP server configuration",
   "license": "GPL-3.0+",
@@ -34,14 +34,16 @@
       "operatingsystem": "RedHat",
       "operatingsystemrelease": [
         "6",
-        "7"
+        "7",
+        "8"
       ]
     },
     {
       "operatingsystem": "CentOS",
       "operatingsystemrelease": [
         "6",
-        "7"
+        "7",
+        "8"
       ]
     },
     {
@@ -54,7 +56,8 @@
     {
       "operatingsystem": "Fedora",
       "operatingsystemrelease": [
-        "26"
+        "30",
+        "31"
       ]
     },
     {