Skip to content

Commit 26de9dc

Browse files
committed
don't use active true, it does more harm than it's useful
1 parent 1ecc0df commit 26de9dc

File tree

1 file changed

+7
-10
lines changed

1 file changed

+7
-10
lines changed

manifests/service.pp

Lines changed: 7 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -42,23 +42,20 @@
4242
enable => bool2str($deployment_mode == 'package', $foreman_service_enable, 'false'),
4343
}
4444

45-
if $deployment_mode == 'package' {
46-
# podman::quadlet already creates a service with the same name
47-
service { "${foreman_service}.service":
48-
ensure => $foreman_service_ensure,
49-
enable => $foreman_service_enable,
50-
before => Service["${foreman_service}.socket"],
51-
}
45+
service { $foreman_service:
46+
ensure => $foreman_service_ensure,
47+
enable => $foreman_service_enable,
48+
before => Service["${foreman_service}.socket"],
5249
}
5350

5451
if $deployment_mode == 'container' {
5552
file { '/etc/containers/systemd':
5653
ensure => directory,
5754
}
55+
File['/etc/containers/systemd/foreman.container'] ~> Service[$foreman_service]
56+
Systemd::Daemon_reload['foreman.container'] ~> Service[$foreman_service]
5857
}
5958

60-
$quadlet_active = $deployment_mode ? { 'container' => true, default => undef }
61-
6259
podman::quadlet { 'foreman.container':
6360
ensure => bool2str($deployment_mode == 'container', 'present', 'absent'),
6461
unit_entry => {
@@ -78,6 +75,6 @@
7875
install_entry => {
7976
'WantedBy' => 'default.target',
8077
},
81-
active => $quadlet_active,
78+
# don't set active true here, it makes podman::quadlet create a service that clashes with ours
8279
}
8380
}

0 commit comments

Comments
 (0)