Skip to content

Commit 84081ed

Browse files
committed
remove non systemd code
1 parent 50d66f5 commit 84081ed

File tree

4 files changed

+19
-79
lines changed

4 files changed

+19
-79
lines changed

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/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/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/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,

0 commit comments

Comments
 (0)