Skip to content

Don't hardcode the service provider #438

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.

Sign up for GitHub

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

Merged
merged 2 commits into from
Mar 26, 2024
Merged

Don't hardcode the service provider #438

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
dea63d6
replace legacy `merge()` with native puppet code
bastelfreak Mar 26, 2024
75c3cf6
Don't hardcode the service provider
bastelfreak Mar 26, 2024
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
2 changes: 1 addition & 1 deletion REFERENCE.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -242,7 +242,7 @@ Default value: `true`

##### <a name="-logstash--service_provider"></a>`service_provider`

Data type: `String`
Data type: `Optional[String[1]]`

Service provider (init system) to use. By Default, the module will try to
choose the 'standard' provider for the current distribution.
Expand Down
2 changes: 1 addition & 1 deletion manifests/init.pp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -154,7 +154,7 @@
$logstash_group = 'logstash',
$config_dir = '/etc/logstash',
Boolean $purge_config = true,
$service_provider = undef,
Optional[String[1]] $service_provider = undef,
$settings = {},
$startup_options = {},
$jvm_options_defaults = {
Expand Down
44 changes: 3 additions & 41 deletions manifests/service.pp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -30,8 +30,8 @@
'SERVICE_DESCRIPTION' => '"logstash"',
}

$settings = merge($default_settings, $logstash::settings)
$startup_options = merge($default_startup_options, $logstash::startup_options)
$settings = $default_settings + $logstash::settings
$startup_options = $default_startup_options + $logstash::startup_options
$jvm_options = $logstash::jvm_options
$jvm_options_defaults = $logstash::jvm_options_defaults
$pipelines = $logstash::pipelines
Expand Down Expand Up @@ -113,50 +113,12 @@
}
}

# Figure out which service provider (init system) we should be using.
# In general, we'll try to guess based on the operating system.
$os = downcase($facts['os']['name'])
$release = $facts['os']['release']['major']
# However, the operator may have explicitly defined the service provider.
if($logstash::service_provider) {
$service_provider = $logstash::service_provider
}
# In the absence of an explicit choice, we'll try to figure out a sensible
# default.
# Puppet 3 doesn't know that Debian 8 uses systemd, not SysV init, so we'll
# help it out with our knowledge from the future.
elsif($os == 'debian' and $release == '8') {
$service_provider = 'systemd'
}
# RedHat/CentOS/OEL 6 uses Upstart by default, but Puppet can get confused about this too.
elsif($os =~ /(redhat|centos|oraclelinux)/ and $release == '6') {
$service_provider = 'upstart'
}
elsif($os =~ /ubuntu/ and $release == '12.04') {
$service_provider = 'upstart'
}
elsif($os =~ /opensuse/ and $release == '13') {
$service_provider = 'systemd'
}
#Older Amazon Linux AMIs has its release based on the year
#it came out (2010 and up); the provider needed to be set explicitly;
#New Amazon Linux 2 AMIs has the release set to 2, Puppet can handle it
elsif($os =~ /amazon/ and versioncmp($release, '2000') > 0) {
$service_provider = 'upstart'
}
else {
# In most cases, Puppet(4) can figure out the correct service
# provider on its own, so we'll just say 'undef', and let it do
# whatever it thinks is best.
$service_provider = undef
}

service { 'logstash':
ensure => $service_ensure,
enable => $service_enable,
hasstatus => true,
hasrestart => true,
Comment on lines 119 to 120
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Since Puppet 2.7 these have defaulted to true. I wonder if we should create a lint plugin to recommend removing them.

provider => $service_provider,
provider => $logstash::service_provider,
}

# If any files tagged as config files for the service are changed, notify
Expand Down