diff --git a/CHANGELOG b/CHANGELOG index 9919370..852a273 100644 --- a/CHANGELOG +++ b/CHANGELOG @@ -1,3 +1,10 @@ +* Wed Jul 29 2026 Hazel Caballero - 3.0.0 +- BREAKING CHANGE: (#126) Remove the deprecated `simp_options::ntpd` class + (the `pupmod-simp-ntpd` module it supported has been archived). Sites that + set `simp_options::ntpd::servers` in hieradata MUST rename the key to + `simp_options::ntp::servers`, which is consumed by the chrony replacement + and by the SIMP client kickstart + * Thu Jul 16 2026 Nicholas Markowski - 2.0.2 - Fix `simp_options::openssl::params` catalog compilation failure on non-Linux nodes when FIPS is enabled (the `fips_ciphers` fact is only diff --git a/REFERENCE.md b/REFERENCE.md index 1361afc..2510f15 100644 --- a/REFERENCE.md +++ b/REFERENCE.md @@ -11,7 +11,6 @@ * [`simp_options::gid`](#simp_options--gid): Provides system-wide defaults for GID settings * [`simp_options::ldap`](#simp_options--ldap): Sets up LDAP configuration variables * [`simp_options::ntp`](#simp_options--ntp): Sets up NTP configuration variables -* [`simp_options::ntpd`](#simp_options--ntpd): Sets up NTP configuration variables * [`simp_options::openssl`](#simp_options--openssl): Sets up OpenSSL configuration variables * [`simp_options::openssl::params`](#simp_options--openssl--params): Sets appropriate openssl cipher suite based on whether FIPS-mode is * [`simp_options::pki`](#simp_options--pki): Sets up global PKI configuration variables @@ -444,27 +443,6 @@ run multiple production systems using individual hardware clocks! Default value: `[]` -### `simp_options::ntpd` - -Sets up NTP configuration variables - -#### Parameters - -The following parameters are available in the `simp_options::ntpd` class: - -* [`servers`](#-simp_options--ntpd--servers) - -##### `servers` - -Data type: `Array[Simplib::Host]` - -**DEPRECATED** Use simp_options::ntp instead. -The list of NTP time servers for the network. -A consistent time source is critical to your systems' security. **DO NOT** -run multiple production systems using individual hardware clocks! - -Default value: `[]` - ### `simp_options::openssl` Sets up OpenSSL configuration variables diff --git a/manifests/init.pp b/manifests/init.pp index 106946d..510af45 100644 --- a/manifests/init.pp +++ b/manifests/init.pp @@ -117,7 +117,6 @@ include 'simp_options::puppet' include 'simp_options::dns' include 'simp_options::ntp' - include 'simp_options::ntpd' include 'simp_options::openssl' include 'simp_options::rsync' include 'simp_options::uid' diff --git a/manifests/ntpd.pp b/manifests/ntpd.pp deleted file mode 100644 index 51ac4cc..0000000 --- a/manifests/ntpd.pp +++ /dev/null @@ -1,16 +0,0 @@ -# @summary Sets up NTP configuration variables -# -# @param servers -# **DEPRECATED** Use simp_options::ntp instead. -# The list of NTP time servers for the network. -# A consistent time source is critical to your systems' security. **DO NOT** -# run multiple production systems using individual hardware clocks! -# -# @author https://github.com/simp/pupmod-simp-simp_options/graphs/contributors -# -class simp_options::ntpd ( - Array[Simplib::Host] $servers = [] -) { - assert_private() - simplib::validate_net_list($servers) -} diff --git a/metadata.json b/metadata.json index 670f954..5fd7f6f 100644 --- a/metadata.json +++ b/metadata.json @@ -1,6 +1,6 @@ { "name": "simp-simp_options", - "version": "2.0.2", + "version": "3.0.0", "author": "SIMP Team", "summary": "Variables enabling SIMP core capabilities", "license": "Apache-2.0", diff --git a/spec/classes/init_spec.rb b/spec/classes/init_spec.rb index 31d0b6d..a5ff8e8 100644 --- a/spec/classes/init_spec.rb +++ b/spec/classes/init_spec.rb @@ -3,7 +3,7 @@ shared_examples_for 'a simp_options class' do it { is_expected.to compile.with_all_deps } it { is_expected.to contain_class('simp_options::dns') } - it { is_expected.to contain_class('simp_options::ntpd') } + it { is_expected.to contain_class('simp_options::ntp') } it { is_expected.to contain_class('simp_options::openssl') } it { is_expected.to contain_class('simp_options::puppet') } it { is_expected.to contain_class('simp_options::rsync') } diff --git a/spec/classes/ntpd_spec.rb b/spec/classes/ntpd_spec.rb deleted file mode 100644 index 0689750..0000000 --- a/spec/classes/ntpd_spec.rb +++ /dev/null @@ -1,28 +0,0 @@ -require 'spec_helper' - -describe 'simp_options' do - context 'supported operating systems' do - on_supported_os.each do |os, facts| - context "on #{os}" do - let(:facts) { facts } - - context 'default parameters for simp_options::ntpd' do - let(:hieradata) { 'simp_options' } - - it { is_expected.to compile.with_all_deps } - it { - is_expected.to contain_class('simp_options::ntpd').with( - servers: [], - ) - } - end - - context 'invalid ntpd servers' do - let(:hieradata) { 'simp_options_with_invalid_ntpd_servers' } - - it { is_expected.not_to compile.with_all_deps } - end - end - end - end -end diff --git a/spec/fixtures/hieradata/simp_options_with_invalid_ntpd_servers.yaml b/spec/fixtures/hieradata/simp_options_with_invalid_ntpd_servers.yaml deleted file mode 100644 index b58f59f..0000000 --- a/spec/fixtures/hieradata/simp_options_with_invalid_ntpd_servers.yaml +++ /dev/null @@ -1,3 +0,0 @@ ---- -simp_options::ntpd::servers : - - '1.2.3.400'