Allow diskcheck env vars into containers (bsc#1270033)

Author: mbussolotto

mgradm/shared/templates/pgsqlServiceTemplate.go

@@ -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}'
 ExecStop=/usr/bin/podman stop \
 	--ignore -t 10 \
 	--cidfile=%t/%n.ctr-id

mgradm/shared/templates/serviceTemplate.go

@@ -43,6 +43,7 @@ ExecStart=/bin/sh -c '/usr/bin/podman run \
 	{{- range .Volumes }}
 	-v {{ .Name }}:{{ .MountPath }} \
 	{{- end }}
+	${PODMAN_EXTRA_ENV_VAR} \
 	--env-file={{ .ServerEnvFile }} \
 	--network {{ .Network }} \
 	{{- if .DBUserSecret }}

mgradm/shared/templates/templates_test.go

@@ -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 \
@@ -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} \
 	--env-file=/etc/systemd/system/uyuni-server.conf.d/server.env \
 	--network uyuni-network \
 	--secret ca-secret,type=mount,target=/etc/pki/ca.crt \

uyuni-tools.changes.mbussolotto.diskcheck_fix

@@ -0,0 +1 @@
+- Allow diskcheck env vars into containers (bsc#1270033)