Skip to content

mgradm: Allow diskcheck env vars into containers (bsc#1270033) #816

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
mbussolotto wants to merge 2 commits into
base: main
Choose a base branch
from
Open

mgradm: Allow diskcheck env vars into containers (bsc#1270033) #816

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
f1a1935
Allow diskcheck env vars into containers (bsc#1270033)
mbussolotto Jul 1, 2026
2f1c030
reload daemon on restart
mbussolotto Jul 3, 2026
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
3 changes: 2 additions & 1 deletion mgradm/cmd/restart/podman.go
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
// SPDX-FileCopyrightText: 2025 SUSE LLC
// SPDX-FileCopyrightText: 2026 SUSE LLC
//
// SPDX-License-Identifier: Apache-2.0

Expand All @@ -20,6 +20,7 @@ func podmanRestart(
_ []string,
) error {
return utils.JoinErrors(
systemd.ReloadDaemon(false),
systemd.RestartService(podman.DBService),
systemd.RestartService(podman.ServerService),
systemd.RestartInstantiated(podman.ServerAttestationService),
Expand Down
2 changes: 1 addition & 1 deletion mgradm/shared/templates/pgsqlServiceTemplate.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -56,7 +56,7 @@ ExecStart=/bin/sh -c '/usr/bin/podman run \
{{- end }}
--network {{ .Network }} \
--health-on-failure=stop \
${UYUNI_BACKUP_VOLUME} ${PODMAN_EXTRA_ARGS} ${UYUNI_IMAGE}'
${PODMAN_EXTRA_ENV_VAR} ${UYUNI_BACKUP_VOLUME} ${PODMAN_EXTRA_ARGS} ${UYUNI_IMAGE}'
Comment thread
mbussolotto marked this conversation as resolved.
ExecStop=/usr/bin/podman stop \
--ignore -t 10 \
--cidfile=%t/%n.ctr-id
Expand Down
1 change: 1 addition & 0 deletions mgradm/shared/templates/serviceTemplate.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -43,6 +43,7 @@ ExecStart=/bin/sh -c '/usr/bin/podman run \
{{- range .Volumes }}
-v {{ .Name }}:{{ .MountPath }} \
{{- end }}
${PODMAN_EXTRA_ENV_VAR} \
Comment thread
mbussolotto marked this conversation as resolved.
--env-file={{ .ServerEnvFile }} \
--network {{ .Network }} \
{{- if .DBUserSecret }}
Expand Down
2 changes: 2 additions & 0 deletions mgradm/shared/templates/templates_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -123,6 +123,7 @@ ExecStart=/bin/sh -c '/usr/bin/podman run \
--arg value \
-p 80:80 \
-v var-spacewalk:/var/spacewalk \
${PODMAN_EXTRA_ENV_VAR} \
--env-file=/etc/systemd/system/uyuni-server.conf.d/server.env \
--network uyuni-network \
--secret uyuni-db-user,type=env,target=MANAGER_USER \
Expand Down Expand Up @@ -211,6 +212,7 @@ ExecStart=/bin/sh -c '/usr/bin/podman run \
--arg value \
-p 80:80 \
-v var-spacewalk:/var/spacewalk \
${PODMAN_EXTRA_ENV_VAR} \
Comment thread
mbussolotto marked this conversation as resolved.
--env-file=/etc/systemd/system/uyuni-server.conf.d/server.env \
--network uyuni-network \
--secret ca-secret,type=mount,target=/etc/pki/ca.crt \
Expand Down
1 change: 1 addition & 0 deletions uyuni-tools.changes.mbussolotto.diskcheck_fix
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
- Allow diskcheck env vars into containers (bsc#1270033)
Loading