Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

implement possibility to manage dependencies or not. #294

Open
wants to merge 3 commits into
base: master
Choose a base branch
from
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
16 changes: 16 additions & 0 deletions REFERENCE.md
Original file line number Diff line number Diff line change
Expand Up @@ -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`
Expand Down Expand Up @@ -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`
Expand Down
4 changes: 4 additions & 0 deletions manifests/enterprise.pp
Original file line number Diff line number Diff line change
Expand Up @@ -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.
#
Expand Down Expand Up @@ -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,
Expand Down
2 changes: 1 addition & 1 deletion manifests/enterprise/install/nix.pp
Original file line number Diff line number Diff line change
Expand Up @@ -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]
Expand Down
4 changes: 4 additions & 0 deletions manifests/forwarder.pp
Original file line number Diff line number Diff line change
Expand Up @@ -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.
#
Expand Down Expand Up @@ -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,
Expand Down
2 changes: 1 addition & 1 deletion manifests/forwarder/install.pp
Original file line number Diff line number Diff line change
Expand Up @@ -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]
Expand Down