diff --git a/REFERENCE.md b/REFERENCE.md index 930d462f..d3000970 100644 --- a/REFERENCE.md +++ b/REFERENCE.md @@ -209,6 +209,14 @@ module. On Windows, this can be a UNC path to the MSI. Default value: `undef` +##### `manage_dependencies` + +Data type: `Boolean` + +Whether or not to manage packages dependencies. + +Default value: `true` + ##### `install_options` Data type: `Splunk::Entinstalloptions` @@ -849,6 +857,14 @@ module. On Windows, this can be a UNC path to the MSI. Default value: `undef` +##### `manage_dependencies` + +Data type: `Boolean` + +Whether or not to manage packages dependencies. + +Default value: `true` + ##### `install_options` Data type: `Splunk::Fwdinstalloptions` diff --git a/manifests/enterprise.pp b/manifests/enterprise.pp index fcd23dda..22fb2d94 100644 --- a/manifests/enterprise.pp +++ b/manifests/enterprise.pp @@ -50,6 +50,9 @@ # it is required. The URL can be of any protocol supported by the puppet/archive # module. On Windows, this can be a UNC path to the MSI. # +# @param manage_dependencies +# Whether or not to manage packages dependencies +# # @param install_options # This variable is passed to the package resources' *install_options* parameter. # @@ -178,6 +181,7 @@ Optional[String[1]] $package_provider = $splunk::params::package_provider, Boolean $manage_package_source = true, Optional[String[1]] $package_source = undef, + Boolean $manage_dependencies = true, Splunk::Entinstalloptions $install_options = $splunk::params::enterprise_install_options, String[1] $splunk_user = $splunk::params::splunk_user, Stdlib::Absolutepath $enterprise_homedir = $splunk::params::enterprise_homedir, diff --git a/manifests/enterprise/install/nix.pp b/manifests/enterprise/install/nix.pp index 5790b46c..e327f411 100644 --- a/manifests/enterprise/install/nix.pp +++ b/manifests/enterprise/install/nix.pp @@ -32,7 +32,7 @@ } # Required for splunk 7.2.4.2 - if versioncmp($splunk::enterprise::version, '7.2.4.2') >= 0 { + if versioncmp($splunk::enterprise::version, '7.2.4.2') >= 0 and $splunk::enterprise::manage_dependencies { ensure_packages(['net-tools'], { 'ensure' => 'present', before => Package[$splunk::enterprise::enterprise_package_name] diff --git a/manifests/forwarder.pp b/manifests/forwarder.pp index dbe269bc..357603ab 100644 --- a/manifests/forwarder.pp +++ b/manifests/forwarder.pp @@ -53,6 +53,9 @@ # it is required. The URL can be of any protocol supported by the puppet/archive # module. On Windows, this can be a UNC path to the MSI. # +# @param manage_dependencies +# Whether or not to manage packages dependencies +# # @param install_options # This variable is passed to the package resources' *install_options* parameter. # @@ -158,6 +161,7 @@ Optional[String[1]] $package_provider = $splunk::params::package_provider, Boolean $manage_package_source = true, Optional[String[1]] $package_source = undef, + Boolean $manage_dependencies = true, Splunk::Fwdinstalloptions $install_options = $splunk::params::forwarder_install_options, String[1] $splunk_user = $splunk::params::splunk_user, Stdlib::Absolutepath $forwarder_homedir = $splunk::params::forwarder_homedir, diff --git a/manifests/forwarder/install.pp b/manifests/forwarder/install.pp index d1f5fdc1..aa277e26 100644 --- a/manifests/forwarder/install.pp +++ b/manifests/forwarder/install.pp @@ -62,7 +62,7 @@ } # Required for splunk 7.2.4.2 - if ($facts['kernel'] == 'Linux' or $facts['kernel'] == 'SunOS') and (versioncmp($splunk::forwarder::version, '7.2.4.2') >= 0) { + if ($facts['kernel'] == 'Linux' or $facts['kernel'] == 'SunOS') and (versioncmp($splunk::forwarder::version, '7.2.4.2') >= 0) and $splunk::forwarder::manage_dependencies { ensure_packages(['net-tools'], { 'ensure' => 'present', before => Package[$splunk::forwarder::package_name]