diff --git a/examples/openscap.pp b/examples/openscap.pp index bb3bf4fd..4084c808 100644 --- a/examples/openscap.pp +++ b/examples/openscap.pp @@ -1,4 +1,5 @@ include foreman_proxy class { 'foreman_proxy::plugin::openscap': - puppet_module => true, + ansible_module => true, + puppet_module => true, } diff --git a/manifests/plugin/openscap.pp b/manifests/plugin/openscap.pp index 4d5787ab..108dda40 100644 --- a/manifests/plugin/openscap.pp +++ b/manifests/plugin/openscap.pp @@ -25,6 +25,8 @@ # # $timeout:: Timeout for sending ARF reports to foreman # +# $ansible_module:: Ensure the Ansible module +# # $puppet_module:: Ensure the Puppet module. This only makes sense if Puppetserver runs on the same machine. # # === Advanced parameters: @@ -36,6 +38,8 @@ # $version:: plugin package version, it's passed to ensure parameter of package resource # can be set to specific version number, 'latest', 'present' etc. # +# $ansible_module_ensure:: The state of the Ansible module to ensure +# # $puppet_module_ensure:: The state of the Puppet module to ensure # class foreman_proxy::plugin::openscap ( @@ -50,6 +54,8 @@ Stdlib::Absolutepath $corrupted_dir = '/var/lib/foreman-proxy/openscap/corrupted', Optional[String] $proxy_name = undef, Integer[0] $timeout = 60, + Boolean $ansible_module = false, + String[1] $ansible_module_ensure = 'present', Boolean $puppet_module = false, String[1] $puppet_module_ensure = 'present', ) { @@ -60,6 +66,12 @@ enabled => $enabled, } + if $ansible_module { + package { 'ansiblerole-foreman_scap_client': + ensure => $ansible_module_ensure, + } + } + if $puppet_module { package { 'puppet-foreman_scap_client': ensure => $puppet_module_ensure, diff --git a/spec/classes/foreman_proxy__plugin__openscap_spec.rb b/spec/classes/foreman_proxy__plugin__openscap_spec.rb index 4ed76eeb..80005280 100644 --- a/spec/classes/foreman_proxy__plugin__openscap_spec.rb +++ b/spec/classes/foreman_proxy__plugin__openscap_spec.rb @@ -35,6 +35,17 @@ end end + context 'with ansible_module' do + let :params do + { + ansible_module: true, + } + end + + it { is_expected.to compile.with_all_deps } + it { is_expected.to contain_package('ansiblerole-foreman_scap_client').with_ensure('present') } + end + context 'with puppet_module' do let :params do {