Skip to content

Commit c52cc17

Browse files
bastelfreakbastelfreak
authored
Merge pull request #357 from zilchms/systemd
Drop support for non systemd OS
2 parents 262f391 + b06a196 commit c52cc17

File tree

17 files changed

+38
-342
lines changed

17 files changed

+38
-342
lines changed

‎REFERENCE.md‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -503,7 +503,7 @@ Default value: `'kafka'`
503503

504504
Data type: `Boolean`
505505

506-
Install the init.d or systemd service.
506+
Install the systemd service.
507507

508508
Default value: `$kafka::params::manage_service`
509509

@@ -872,7 +872,7 @@ Default value: `'kafka-consumer'`
872872

873873
Data type: `Boolean`
874874

875-
Install the init.d or systemd service.
875+
Install the systemd service.
876876

877877
Default value: `$kafka::params::manage_service`
878878

@@ -1208,7 +1208,7 @@ Default value: `'kafka-mirror'`
12081208

12091209
Data type: `Boolean`
12101210

1211-
Install the init.d or systemd service.
1211+
Install the systemd service.
12121212

12131213
Default value: `$kafka::params::manage_service`
12141214

@@ -1560,7 +1560,7 @@ Default value: `'kafka-producer'`
15601560

15611561
Data type: `Boolean`
15621562

1563-
Install the init.d or systemd service.
1563+
Install systemd service.
15641564

15651565
Default value: `$kafka::params::manage_service`
15661566

‎manifests/broker.pp‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -70,7 +70,7 @@
7070
# Set the name of the service.
7171
#
7272
# @param manage_service
73-
# Install the init.d or systemd service.
73+
# Install the systemd service.
7474
#
7575
# @param service_ensure
7676
# Set the ensure state of the service.

‎manifests/broker/service.pp‎

Lines changed: 6 additions & 23 deletions
Original file line numberDiff line numberDiff line change
@@ -36,31 +36,14 @@
3636
}
3737
$environment = deep_merge($env_defaults, $env)
3838

39-
if $facts['service_provider'] == 'systemd' {
40-
include systemd
39+
include systemd
4140

42-
file { "/etc/systemd/system/${service_name}.service":
43-
ensure => file,
44-
mode => '0644',
45-
content => template('kafka/unit.erb'),
46-
}
47-
48-
file { "/etc/init.d/${service_name}":
49-
ensure => absent,
50-
}
51-
52-
File["/etc/systemd/system/${service_name}.service"]
53-
~> Service[$service_name]
54-
} else {
55-
file { "/etc/init.d/${service_name}":
56-
ensure => file,
57-
mode => '0755',
58-
content => template('kafka/init.erb'),
59-
before => Service[$service_name],
60-
}
41+
file { "/etc/systemd/system/${service_name}.service":
42+
ensure => file,
43+
mode => '0644',
44+
content => template('kafka/unit.erb'),
6145
}
62-
63-
service { $service_name:
46+
~> service { $service_name:
6447
ensure => $service_ensure,
6548
enable => true,
6649
hasstatus => true,

‎manifests/consumer.pp‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -70,7 +70,7 @@
7070
# Set the name of the service.
7171
#
7272
# @param manage_service
73-
# Install the init.d or systemd service.
73+
# Install the systemd service.
7474
#
7575
# @param service_ensure
7676
# Set the ensure state of the service.

‎manifests/consumer/service.pp‎

Lines changed: 6 additions & 23 deletions
Original file line numberDiff line numberDiff line change
@@ -36,31 +36,14 @@
3636
}
3737
$environment = deep_merge($env_defaults, $env)
3838

39-
if $facts['service_provider'] == 'systemd' {
40-
include systemd
39+
include systemd
4140

42-
file { "/etc/systemd/system/${service_name}.service":
43-
ensure => file,
44-
mode => '0644',
45-
content => template('kafka/unit.erb'),
46-
}
47-
48-
file { "/etc/init.d/${service_name}":
49-
ensure => absent,
50-
}
51-
52-
File["/etc/systemd/system/${service_name}.service"]
53-
~> Service[$service_name]
54-
} else {
55-
file { "/etc/init.d/${service_name}":
56-
ensure => file,
57-
mode => '0755',
58-
content => template('kafka/init.erb'),
59-
before => Service[$service_name],
60-
}
41+
file { "/etc/systemd/system/${service_name}.service":
42+
ensure => file,
43+
mode => '0644',
44+
content => template('kafka/unit.erb'),
6145
}
62-
63-
service { $service_name:
46+
~> service { $service_name:
6447
ensure => $service_ensure,
6548
enable => true,
6649
hasstatus => true,

‎manifests/mirror.pp‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -76,7 +76,7 @@
7676
# Set the name of the service.
7777
#
7878
# @param manage_service
79-
# Install the init.d or systemd service.
79+
# Install the systemd service.
8080
#
8181
# @param service_ensure
8282
# Set the ensure state of the service.

‎manifests/mirror/service.pp‎

Lines changed: 6 additions & 23 deletions
Original file line numberDiff line numberDiff line change
@@ -33,31 +33,14 @@
3333
}
3434
$environment = deep_merge($env_defaults, $env)
3535

36-
if $facts['service_provider'] == 'systemd' {
37-
include systemd
36+
include systemd
3837

39-
file { "/etc/systemd/system/${service_name}.service":
40-
ensure => file,
41-
mode => '0644',
42-
content => template('kafka/unit.erb'),
43-
}
44-
45-
file { "/etc/init.d/${service_name}":
46-
ensure => absent,
47-
}
48-
49-
File["/etc/systemd/system/${service_name}.service"]
50-
~> Service[$service_name]
51-
} else {
52-
file { "/etc/init.d/${service_name}":
53-
ensure => file,
54-
mode => '0755',
55-
content => template('kafka/init.erb'),
56-
before => Service[$service_name],
57-
}
38+
file { "/etc/systemd/system/${service_name}.service":
39+
ensure => file,
40+
mode => '0644',
41+
content => template('kafka/unit.erb'),
5842
}
59-
60-
service { $service_name:
43+
~> service { $service_name:
6144
ensure => $service_ensure,
6245
enable => true,
6346
hasstatus => true,

‎manifests/producer.pp‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -73,7 +73,7 @@
7373
# Set the name of the service.
7474
#
7575
# @param manage_service
76-
# Install the init.d or systemd service.
76+
# Install systemd service.
7777
#
7878
# @param service_ensure
7979
# Set the ensure state of the service.

‎manifests/producer/service.pp‎

Lines changed: 1 addition & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -37,16 +37,7 @@
3737
}
3838
$environment = deep_merge($env_defaults, $env)
3939

40-
if $facts['service_provider'] == 'systemd' {
41-
fail('Console Producer is not supported on systemd, because the stdin of the process cannot be redirected')
42-
} else {
43-
file { "/etc/init.d/${service_name}":
44-
ensure => file,
45-
mode => '0755',
46-
content => template('kafka/init.erb'),
47-
before => Service[$service_name],
48-
}
49-
}
40+
fail('Console Producer is not supported on systemd, because the stdin of the process cannot be redirected')
5041

5142
service { $service_name:
5243
ensure => $service_ensure,

‎spec/acceptance/broker_spec.rb‎

Lines changed: 2 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -162,7 +162,7 @@ class { 'kafka::broker':
162162
apply_manifest(pp, catch_failures: true)
163163
end
164164

165-
describe file('/etc/systemd/system/kafka.service'), if: (fact('operatingsystemmajrelease') == '7' && fact('osfamily') == 'RedHat') do
165+
describe file('/etc/systemd/system/kafka.service') do
166166
it { is_expected.to be_file }
167167
it { is_expected.to be_owned_by 'root' }
168168
it { is_expected.to be_grouped_into 'root' }
@@ -197,17 +197,7 @@ class { 'kafka::broker':
197197
apply_manifest(pp, catch_changes: true)
198198
end
199199

200-
describe file('/etc/init.d/kafka'), if: (fact('service_provider') == 'upstart' && fact('osfamily') == 'Debian') do
201-
it { is_expected.to be_file }
202-
it { is_expected.to be_owned_by 'root' }
203-
it { is_expected.to be_grouped_into 'root' }
204-
it { is_expected.to contain %r{^# Provides:\s+kafka$} }
205-
it { is_expected.to contain 'export KAFKA_JMX_OPTS="-Dcom.sun.management.jmxremote"' }
206-
it { is_expected.to contain 'export KAFKA_HEAP_OPTS="-Xmx512M -Xmx512M"' }
207-
it { is_expected.to contain 'export KAFKA_LOG4J_OPTS="-Dlog4j.configuration=file:/tmp/log4j.properties"' }
208-
end
209-
210-
describe file('/etc/systemd/system/kafka.service'), if: (fact('operatingsystemmajrelease') == '7' && fact('osfamily') == 'RedHat') do
200+
describe file('/etc/systemd/system/kafka.service') do
211201
it { is_expected.to be_file }
212202
it { is_expected.to be_owned_by 'root' }
213203
it { is_expected.to be_grouped_into 'root' }

0 commit comments

Comments
 (0)