From f354d07094c0c3901c51f54f45ce9ab313f10e37 Mon Sep 17 00:00:00 2001 From: Mike Riddle Date: Mon, 31 Jul 2023 20:36:52 -0400 Subject: [PATCH] Finalize RockyLinux 8 support (#70) --- .github/workflows/pr_tests.yml | 1 + .gitignore | 1 + .gitlab-ci.yml | 1 + REFERENCE.md | 62 +++++++++++++++++----------------- 4 files changed, 34 insertions(+), 31 deletions(-) diff --git a/.github/workflows/pr_tests.yml b/.github/workflows/pr_tests.yml index e4bc468..1780c4a 100644 --- a/.github/workflows/pr_tests.yml +++ b/.github/workflows/pr_tests.yml @@ -117,6 +117,7 @@ jobs: puppet_version: '~> 8.0' ruby_version: 3.1 experimental: true + fail-fast: false env: PUPPET_VERSION: ${{matrix.puppet.puppet_version}} steps: diff --git a/.gitignore b/.gitignore index 706aeb6..410b067 100644 --- a/.gitignore +++ b/.gitignore @@ -24,3 +24,4 @@ dist /junit /log /doc +/Gemfile.lock diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index d4e371a..8698d3c 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -340,6 +340,7 @@ pup7.pe-unit: <<: *pup_7_pe <<: *unit_tests +# Commenting until Puppet 8 is released #pup8.x-unit: # <<: *pup_8_x # <<: *unit_tests diff --git a/REFERENCE.md b/REFERENCE.md index ccd04aa..d10e231 100644 --- a/REFERENCE.md +++ b/REFERENCE.md @@ -7,7 +7,7 @@ ### Classes * [`dhcp`](#dhcp): A selector for configuring the DHCP server or client -* [`dhcp::dhcpd`](#dhcpdhcpd): This class is used to start dhcpd and create dhcpd.conf +* [`dhcp::dhcpd`](#dhcp--dhcpd): This class is used to start dhcpd and create dhcpd.conf ## Classes @@ -19,26 +19,26 @@ The client portion has not yet been implemented. The following parameters are available in the `dhcp` class: -* [`is_client`](#is_client) -* [`is_server`](#is_server) +* [`is_client`](#-dhcp--is_client) +* [`is_server`](#-dhcp--is_server) -##### `is_client` +##### `is_client` Data type: `Boolean` Not yet implemented -Default value: ``false`` +Default value: `false` -##### `is_server` +##### `is_server` Data type: `Boolean` Denotes that the system is a DHCP server -Default value: ``true`` +Default value: `true` -### `dhcp::dhcpd` +### `dhcp::dhcpd` This class is used to start dhcpd and create dhcpd.conf @@ -46,24 +46,24 @@ This class is used to start dhcpd and create dhcpd.conf The following parameters are available in the `dhcp::dhcpd` class: -* [`package_name`](#package_name) -* [`enable_data_rsync`](#enable_data_rsync) -* [`rsync_server`](#rsync_server) -* [`rsync_timeout`](#rsync_timeout) -* [`dhcpd_conf`](#dhcpd_conf) -* [`firewall`](#firewall) -* [`logrotate`](#logrotate) -* [`syslog`](#syslog) -* [`package_ensure`](#package_ensure) -* [`rsync_source`](#rsync_source) +* [`package_name`](#-dhcp--dhcpd--package_name) +* [`enable_data_rsync`](#-dhcp--dhcpd--enable_data_rsync) +* [`rsync_server`](#-dhcp--dhcpd--rsync_server) +* [`rsync_timeout`](#-dhcp--dhcpd--rsync_timeout) +* [`dhcpd_conf`](#-dhcp--dhcpd--dhcpd_conf) +* [`firewall`](#-dhcp--dhcpd--firewall) +* [`logrotate`](#-dhcp--dhcpd--logrotate) +* [`syslog`](#-dhcp--dhcpd--syslog) +* [`package_ensure`](#-dhcp--dhcpd--package_ensure) +* [`rsync_source`](#-dhcp--dhcpd--rsync_source) -##### `package_name` +##### `package_name` Data type: `String[1]` The DHCP server package name -##### `enable_data_rsync` +##### `enable_data_rsync` Data type: `Boolean` @@ -71,9 +71,9 @@ Enable the retrieval of the DHCP configuration from an rsync server * NOTE: This will be disabled by default at some point in the future -Default value: ``true`` +Default value: `true` -##### `rsync_server` +##### `rsync_server` Data type: `String[1]` @@ -82,7 +82,7 @@ configuration Default value: `simplib::lookup('simp_options::rsync::server', { 'default_value' => '127.0.0.1' })` -##### `rsync_timeout` +##### `rsync_timeout` Data type: `Stdlib::Compat::Integer` @@ -90,7 +90,7 @@ The connection timeout when communicating with the rsync server Default value: `simplib::lookup('simp_options::rsync::timeout', { 'default_value' => '2' })` -##### `dhcpd_conf` +##### `dhcpd_conf` Data type: `Optional[String[1]]` @@ -98,9 +98,9 @@ The entire contents of the /etc/dhcpd.conf configuration file * If this is set, `$enable_data_rsync` will be forced to `false` -Default value: ``undef`` +Default value: `undef` -##### `firewall` +##### `firewall` Data type: `Boolean` @@ -108,7 +108,7 @@ Whether or not to include the SIMP iptables class Default value: `simplib::lookup('simp_options::firewall', { 'default_value' => false })` -##### `logrotate` +##### `logrotate` Data type: `Boolean` @@ -116,7 +116,7 @@ Whether or not to include the SIMP logrotate class Default value: `simplib::lookup('simp_options::logrotate', { 'default_value' => false })` -##### `syslog` +##### `syslog` Data type: `Boolean` @@ -124,7 +124,7 @@ Whether or not to include the SIMP rsyslog class Default value: `simplib::lookup('simp_options::syslog', { 'default_value' => false })` -##### `package_ensure` +##### `package_ensure` Data type: `String[1]` @@ -132,11 +132,11 @@ The ensure status of the dhcp package Default value: `simplib::lookup('simp_options::package_ensure', { 'default_value' => 'installed' })` -##### `rsync_source` +##### `rsync_source` Data type: `String[1]` -Default value: `"dhcpd_${::environment}_${facts['os']['name']}/dhcpd.conf"` +Default value: `"dhcpd_${facts['environment']}_${facts['os']['name']}/dhcpd.conf"`