Skip to content

Commit 6fa594c

Browse files
author
Andrew Beresford
committed
Add datatypes and fix up missed use of package_source
1 parent eb8790e commit 6fa594c

File tree

2 files changed

+51
-51
lines changed

2 files changed

+51
-51
lines changed

‎manifests/forwarder.pp‎

Lines changed: 23 additions & 23 deletions
Original file line numberDiff line numberDiff line change
@@ -55,28 +55,28 @@
5555
# Requires: nothing
5656
#
5757
class splunk::forwarder (
58-
$server = $splunk::params::server,
59-
$manage_package_source = true,
60-
$package_source = undef,
61-
$package_name = $splunk::params::forwarder_pkg_name,
62-
$package_ensure = $splunk::params::forwarder_pkg_ensure,
63-
$logging_port = $splunk::params::logging_port,
64-
$splunkd_port = $splunk::params::splunkd_port,
65-
$install_options = $splunk::params::forwarder_install_options,
66-
$splunk_user = $splunk::params::splunk_user,
67-
$splunkd_listen = '127.0.0.1',
68-
$purge_deploymentclient = false,
69-
$purge_inputs = false,
70-
$purge_outputs = false,
71-
$purge_props = false,
72-
$purge_transforms = false,
73-
$purge_web = false,
74-
$pkg_provider = $splunk::params::pkg_provider,
75-
$forwarder_confdir = $splunk::params::forwarder_confdir,
76-
$forwarder_output = $splunk::params::forwarder_output,
77-
$forwarder_input = $splunk::params::forwarder_input,
78-
$create_password = $splunk::params::create_password,
79-
$addons = {},
58+
String $server = $splunk::params::server,
59+
Boolean $manage_package_source = true,
60+
Optional[String] $package_source = undef,
61+
String $package_name = $splunk::params::forwarder_pkg_name,
62+
String $package_ensure = $splunk::params::forwarder_pkg_ensure,
63+
Variant[String,Integer] $logging_port = $splunk::params::logging_port,
64+
Variant[String,Integer] $splunkd_port = $splunk::params::splunkd_port,
65+
Optional[String] $install_options = $splunk::params::forwarder_install_options,
66+
String $splunk_user = $splunk::params::splunk_user,
67+
String $splunkd_listen = '127.0.0.1',
68+
Boolean $purge_deploymentclient = false,
69+
Boolean $purge_inputs = false,
70+
Boolean $purge_outputs = false,
71+
Boolean $purge_props = false,
72+
Boolean $purge_transforms = false,
73+
Boolean $purge_web = false,
74+
String $pkg_provider = $splunk::params::pkg_provider,
75+
String $forwarder_confdir = $splunk::params::forwarder_confdir,
76+
Hash $forwarder_output = $splunk::params::forwarder_output,
77+
Hash $forwarder_input = $splunk::params::forwarder_input,
78+
Boolean $create_password = $splunk::params::create_password,
79+
Hash $addons = {},
8080
) inherits splunk::params {
8181

8282
$virtual_service = $splunk::params::forwarder_service
@@ -93,7 +93,7 @@
9393
if $pkg_provider != undef and $pkg_provider != 'yum' and $pkg_provider != 'apt' and $pkg_provider != 'chocolatey' {
9494
include ::archive::staging
9595

96-
$src_pkg_filename = basename($package_source)
96+
$src_pkg_filename = basename($_package_source)
9797
$pkg_path_parts = [$archive::path, $staging_subdir, $src_pkg_filename]
9898
$staged_package = join($pkg_path_parts, $path_delimiter)
9999

‎manifests/init.pp‎

Lines changed: 28 additions & 28 deletions
Original file line numberDiff line numberDiff line change
@@ -48,32 +48,32 @@
4848
# Requires: nothing
4949
#
5050
class splunk (
51-
$manage_package_source = true,
52-
$package_source = undef,
53-
$package_name = $splunk::params::server_pkg_name,
54-
$package_ensure = $splunk::params::server_pkg_ensure,
55-
$server_service = $splunk::params::server_service,
56-
$logging_port = $splunk::params::logging_port,
57-
$splunkd_port = $splunk::params::splunkd_port,
58-
$splunk_user = $splunk::params::splunk_user,
59-
$pkg_provider = $splunk::params::pkg_provider,
60-
$splunkd_listen = '127.0.0.1',
61-
$web_port = '8000',
62-
$purge_alert_actions = false,
63-
$purge_authentication = false,
64-
$purge_authorize = false,
65-
$purge_deploymentclient = false,
66-
$purge_distsearch = false,
67-
$purge_indexes = false,
68-
$purge_inputs = false,
69-
$purge_limits = false,
70-
$purge_outputs = false,
71-
$purge_props = false,
72-
$purge_server = false,
73-
$purge_serverclass = false,
74-
$purge_transforms = false,
75-
$purge_uiprefs = false,
76-
$purge_web = false,
51+
Boolean $manage_package_source = true,
52+
Optional[String] $package_source = undef,
53+
String $package_name = $splunk::params::server_pkg_name,
54+
String $package_ensure = $splunk::params::server_pkg_ensure,
55+
Variant[Array[String],String] $server_service = $splunk::params::server_service,
56+
Variant[String,Integer] $logging_port = $splunk::params::logging_port,
57+
Variant[String,Integer] $splunkd_port = $splunk::params::splunkd_port,
58+
String $splunk_user = $splunk::params::splunk_user,
59+
String $pkg_provider = $splunk::params::pkg_provider,
60+
String $splunkd_listen = '127.0.0.1',
61+
Variant[String,Integer] $web_port = '8000',
62+
Boolean $purge_alert_actions = false,
63+
Boolean $purge_authentication = false,
64+
Boolean $purge_authorize = false,
65+
Boolean $purge_deploymentclient = false,
66+
Boolean $purge_distsearch = false,
67+
Boolean $purge_indexes = false,
68+
Boolean $purge_inputs = false,
69+
Boolean $purge_limits = false,
70+
Boolean $purge_outputs = false,
71+
Boolean $purge_props = false,
72+
Boolean $purge_server = false,
73+
Boolean $purge_serverclass = false,
74+
Boolean $purge_transforms = false,
75+
Boolean $purge_uiprefs = false,
76+
Boolean $purge_web = false,
7777
) inherits splunk::params {
7878

7979
$virtual_service = $server_service
@@ -88,12 +88,12 @@
8888

8989
if $pkg_provider != undef and $pkg_provider != 'yum' and $pkg_provider != 'apt' and $pkg_provider != 'chocolatey' {
9090
include ::archive::staging
91-
$src_pkg_filename = basename($package_source)
91+
$src_pkg_filename = basename($_package_source)
9292
$pkg_path_parts = [$archive::path, $staging_subdir, $src_pkg_filename]
9393
$staged_package = join($pkg_path_parts, $path_delimiter)
9494

9595
archive { $staged_package:
96-
source => $package_source,
96+
source => $_package_source,
9797
extract => false,
9898
before => Package[$package_name],
9999
}

0 commit comments

Comments
 (0)