Skip to content

Commit 0196eac

Browse files
author
oloc
committed
lsf_name : use a unique name in all situations
1 parent 387c7c8 commit 0196eac

File tree

3 files changed

+12
-4
lines changed

3 files changed

+12
-4
lines changed

manifests/config.pp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -123,7 +123,7 @@
123123
logstashforwarder_config { 'lsf-config':
124124
ensure => 'present',
125125
config => $main_config,
126-
path => '/etc/logstash-forwarder.conf',
126+
path => "${logstashforwarder::configdir}/${logstashforwarder::lsf_name}.conf",
127127
tag => "LSF_CONFIG_${::fqdn}",
128128
owner => $logstashforwarder::logstashforwarder_user,
129129
group => $logstashforwarder::logstashforwarder_group,

manifests/init.pp

Lines changed: 6 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -20,6 +20,10 @@
2020
# * This is thus destructive and should be used with care.
2121
# Defaults to <tt>present</tt>.
2222
#
23+
# [*lsf_name*]
24+
# String. Set the name used in any situations to avoid gap of naming.
25+
# Defaults to <tt>logstash-forwarder</tt>.
26+
#
2327
# [*autoupgrade*]
2428
# Boolean. If set to <tt>true</tt>, any managed package gets upgraded
2529
# on each Puppet run when the package provider is able to find a newer
@@ -154,6 +158,7 @@
154158
#
155159
class logstashforwarder(
156160
$ensure = $logstashforwarder::params::ensure,
161+
$lsf_name = $logstashforwarder::params::lsf_name,
157162
$servers = undef,
158163
$ssl_cert = undef,
159164
$ssl_key = undef,
@@ -176,7 +181,7 @@
176181
$init_defaults = $logstashforwarder::params::init_defaults,
177182
$init_defaults_file = undef,
178183
$init_template = undef,
179-
$manage_repo = false
184+
$manage_repo = true,
180185
) inherits logstashforwarder::params {
181186

182187
anchor {'logstashforwarder::begin': }

manifests/params.pp

Lines changed: 5 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -34,6 +34,9 @@
3434
# ensure
3535
$ensure = 'present'
3636

37+
# Name to use instead of hardcoded name
38+
$lsf_name = 'logstash-forwarder'
39+
3740
# autoupgrade
3841
$autoupgrade = false
3942

@@ -123,15 +126,15 @@
123126
# service parameters
124127
case $::operatingsystem {
125128
'RedHat', 'CentOS', 'Fedora', 'Scientific', 'Amazon', 'OracleLinux': {
126-
$service_name = 'logstash-forwarder'
129+
$service_name = $lsf_name
127130
$service_hasrestart = true
128131
$service_hasstatus = true
129132
$service_pattern = $service_name
130133
$service_providers = [ 'init' ]
131134
$defaults_location = '/etc/sysconfig'
132135
}
133136
'Debian', 'Ubuntu': {
134-
$service_name = 'logstash-forwarder'
137+
$service_name = $lsf_name
135138
$service_hasrestart = true
136139
$service_hasstatus = true
137140
$service_pattern = $service_name

0 commit comments

Comments
 (0)