Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 3 additions & 3 deletions mgradm/shared/templates/pgsqlServiceTemplate.go
Original file line number Diff line number Diff line change
Expand Up @@ -33,7 +33,8 @@ ExecStart=/bin/sh -c '/usr/bin/podman run \
--cgroups=no-conmon \
--shm-size=0 \
--shm-size-systemd=0 \
--sdnotify=healthy \
--sdnotify=conmon \
-d \
--name {{ .NamePrefix }}-db \
--hostname {{ .NamePrefix }}-db.mgr.internal \
--network-alias db \
Expand Down Expand Up @@ -67,8 +68,7 @@ ExecStopPost=/usr/bin/podman rm \
PIDFile=%t/%n.pid
TimeoutStopSec=180
TimeoutStartSec=900
Type=notify
NotifyAccess=all
Type=forking

[Install]
WantedBy=multi-user.target default.target
Expand Down
6 changes: 3 additions & 3 deletions mgradm/shared/templates/serviceTemplate.go
Original file line number Diff line number Diff line change
Expand Up @@ -31,8 +31,9 @@ ExecStart=/bin/sh -c '/usr/bin/podman run \
--cgroups=no-conmon \
--shm-size=0 \
--shm-size-systemd=0 \
--sdnotify=healthy \
--sdnotify=conmon \
--systemd=always \
-d \
--name {{ .NamePrefix }}-server \
--hostname {{ .NamePrefix }}-server.mgr.internal \
{{ .Args }} \
Expand Down Expand Up @@ -86,8 +87,7 @@ ExecStopPost=/usr/bin/podman rm \
PIDFile=%t/uyuni-server.pid
TimeoutStopSec=180
TimeoutStartSec=900
Type=notify
NotifyAccess=all
Type=forking
[Install]
WantedBy=multi-user.target default.target
Expand Down
12 changes: 6 additions & 6 deletions mgradm/shared/templates/templates_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -115,8 +115,9 @@ ExecStart=/bin/sh -c '/usr/bin/podman run \
--cgroups=no-conmon \
--shm-size=0 \
--shm-size-systemd=0 \
--sdnotify=healthy \
--sdnotify=conmon \
--systemd=always \
-d \
--name uyuni-server \
--hostname uyuni-server.mgr.internal \
--arg value \
Expand Down Expand Up @@ -158,8 +159,7 @@ ExecStopPost=/usr/bin/podman rm \
PIDFile=%t/uyuni-server.pid
TimeoutStopSec=180
TimeoutStartSec=900
Type=notify
NotifyAccess=all
Type=forking

[Install]
WantedBy=multi-user.target default.target
Expand Down Expand Up @@ -203,8 +203,9 @@ ExecStart=/bin/sh -c '/usr/bin/podman run \
--cgroups=no-conmon \
--shm-size=0 \
--shm-size-systemd=0 \
--sdnotify=healthy \
--sdnotify=conmon \
--systemd=always \
-d \
--name uyuni-server \
--hostname uyuni-server.mgr.internal \
--arg value \
Expand Down Expand Up @@ -238,8 +239,7 @@ ExecStopPost=/usr/bin/podman rm \
PIDFile=%t/uyuni-server.pid
TimeoutStopSec=180
TimeoutStartSec=900
Type=notify
NotifyAccess=all
Type=forking

[Install]
WantedBy=multi-user.target default.target
Expand Down
2 changes: 2 additions & 0 deletions uyuni-tools.changes.oholecek.revert_notify
Original file line number Diff line number Diff line change
@@ -0,0 +1,2 @@
- Revert usage of sdnotify as it causes podman panic on SP7
(bsc#1270399, bsc#1270398)
2 changes: 1 addition & 1 deletion uyuni-tools.spec
Original file line number Diff line number Diff line change
Expand Up @@ -116,7 +116,7 @@ Requires: (netavark if podman)
Requires: openssl
# suse_version
%if "%{_vendor}" != "debbuild"
Requires: (podman >= 4.7.2 if podman)
Requires: (podman >= 4.5.0 if podman)
%endif

%description -n %{name_adm}
Expand Down
Loading