Skip to content

Commit fb21f98

Browse files
committed
Use service provider to determine service commands
Rather than using static OS definitions, this uses the service_provider parameter or fact (provided by puppetlabs/stdlib).
1 parent 423dcbf commit fb21f98

File tree

1 file changed

+6
-22
lines changed

1 file changed

+6
-22
lines changed

manifests/params.pp

Lines changed: 6 additions & 22 deletions
Original file line numberDiff line numberDiff line change
@@ -82,28 +82,12 @@
8282
$postgresql_conf_mode = pick($postgresql_conf_mode, '0600')
8383
}
8484

85-
case $facts['os']['name'] {
86-
'Amazon': {
87-
$service_reload = "service ${service_name} reload"
88-
$service_status = "service ${service_name} status"
89-
}
90-
91-
# RHEL 5 uses SysV init, RHEL 6 uses upstart, RHEL 7+ uses systemd.
92-
'RedHat', 'CentOS', 'Scientific', 'OracleLinux': {
93-
if versioncmp($facts['os']['release']['major'], '7') >= 0 {
94-
$service_reload = "systemctl reload ${service_name}"
95-
$service_status = "systemctl status ${service_name}"
96-
} else {
97-
$service_reload = "service ${service_name} reload"
98-
$service_status = "service ${service_name} status"
99-
}
100-
}
101-
102-
# Default will catch Fedora which uses systemd
103-
default: {
104-
$service_reload = "systemctl reload ${service_name}"
105-
$service_status = "systemctl status ${service_name}"
106-
}
85+
if pick($service_provider, $facts['service_provider']) == 'systemd' {
86+
$service_reload = "systemctl reload ${service_name}"
87+
$service_status = "systemctl status ${service_name}"
88+
} else {
89+
$service_reload = "service ${service_name} reload"
90+
$service_status = "service ${service_name} status"
10791
}
10892

10993
$psql_path = pick($psql_path, "${bindir}/psql")

0 commit comments

Comments
 (0)