diff --git a/metadata.json b/metadata.json index ca931c4..ef8fe42 100644 --- a/metadata.json +++ b/metadata.json @@ -22,21 +22,24 @@ "operatingsystem": "RedHat", "operatingsystemrelease": [ "7", - "8" + "8", + "9" ] }, { "operatingsystem": "CentOS", "operatingsystemrelease": [ "7", - "8" + "8", + "9" ] }, { "operatingsystem": "OracleLinux", "operatingsystemrelease": [ "7", - "8" + "8", + "9" ] }, { diff --git a/spec/acceptance/class_spec.rb b/spec/acceptance/class_spec.rb index 737cba5..9686e9a 100644 --- a/spec/acceptance/class_spec.rb +++ b/spec/acceptance/class_spec.rb @@ -20,12 +20,12 @@ class { 'clamav': context 'clamd' do # set params - if fact('osfamily') == 'RedHat' + if fact('os.family') == 'RedHat' service_name = 'clamd' clamd_name = 'clamd' end - if fact('osfamily') == 'Debian' + if fact('os.family') == 'Debian' service_name = 'clamav-daemon' clamd_name = 'clamav-daemon' end diff --git a/spec/classes/clamav_spec.rb b/spec/classes/clamav_spec.rb index a116ab0..99a25ce 100644 --- a/spec/classes/clamav_spec.rb +++ b/spec/classes/clamav_spec.rb @@ -9,9 +9,9 @@ context 'with defaults' do it { is_expected.to compile.with_all_deps } - if facts[:osfamily] == 'RedHat' + if facts[:os]['family'] == 'RedHat' it { is_expected.to contain_class('epel') } - elsif facts[:osfamily] == 'Debian' + elsif facts[:os]['family'] == 'Debian' it { is_expected.not_to contain_class('epel') } end it { is_expected.not_to contain_class('clamav::user') } @@ -40,7 +40,7 @@ end context 'manage manage_clamav_milter' do - if facts[:osfamily] == 'RedHat' && facts[:operatingsystemrelease] >= '7.0' + if facts[:os]['family'] == 'RedHat' && facts[:os]['release']['full'] >= '7.0' let(:params) { { manage_clamav_milter: true } } it { is_expected.to contain_class('clamav::clamav_milter') } @@ -82,15 +82,15 @@ let(:params) { { manage_freshclam: true } } context 'with defaults' do - if facts[:osfamily] == 'RedHat' - if facts[:operatingsystemmajrelease].to_i == 6 + if facts[:os]['family'] == 'RedHat' + if facts[:os]['release']['major'].to_i == 6 it 'is valid when there is no freshclam package' do is_expected.not_to contain_package('freshclam') end it 'is valid when there no file freshclam_sysconfig' do is_expected.not_to contain_file('freshclam_sysconfig') end - elsif facts[:operatingsystemmajrelease].to_i == 7 + elsif facts[:os]['release']['major'].to_i == 7 it 'is valid when there is freshclam package' do is_expected.to contain_package('freshclam') end @@ -104,7 +104,7 @@ it 'is valid when there is no freshclam service' do is_expected.not_to contain_service('freshclam') end - elsif facts[:osfamily] == 'Debian' + elsif facts[:os]['family'] == 'Debian' it { is_expected.to contain_package('freshclam') } it { is_expected.to contain_file('freshclam.conf') } it { is_expected.to contain_service('freshclam') } diff --git a/spec/spec_helper_acceptance.rb b/spec/spec_helper_acceptance.rb index 7c6a9e4..0066d85 100644 --- a/spec/spec_helper_acceptance.rb +++ b/spec/spec_helper_acceptance.rb @@ -19,7 +19,7 @@ copy_module_to(host, source: proj_root, module_name: 'clamav') on host, puppet('module', 'install', 'puppetlabs-stdlib'), acceptable_exit_codes: [0, 1] - if fact('osfamily') == 'RedHat' + if fact('os.family') == 'RedHat' on host, puppet('module', 'install', 'puppet-epel'), acceptable_exit_codes: [0, 1] end end