|
42 | 42 | enable => bool2str($deployment_mode == 'package', $foreman_service_enable, 'false'),
|
43 | 43 | }
|
44 | 44 |
|
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"], |
52 | 49 | }
|
53 | 50 |
|
54 | 51 | if $deployment_mode == 'container' {
|
55 | 52 | file { '/etc/containers/systemd':
|
56 | 53 | ensure => directory,
|
57 | 54 | }
|
| 55 | + File['/etc/containers/systemd/foreman.container'] ~> Service[$foreman_service] |
| 56 | + Systemd::Daemon_reload['foreman.container'] ~> Service[$foreman_service] |
58 | 57 | }
|
59 | 58 |
|
60 |
| - $quadlet_active = $deployment_mode ? { 'container' => true, default => undef } |
61 |
| - |
62 | 59 | podman::quadlet { 'foreman.container':
|
63 | 60 | ensure => bool2str($deployment_mode == 'container', 'present', 'absent'),
|
64 | 61 | unit_entry => {
|
|
78 | 75 | install_entry => {
|
79 | 76 | 'WantedBy' => 'default.target',
|
80 | 77 | },
|
81 |
| - active => $quadlet_active, |
| 78 | + # don't set active true here, it makes podman::quadlet create a service that clashes with ours |
82 | 79 | }
|
83 | 80 | }
|
0 commit comments