Skip to content

Make uyuni-server dependent on uyuni-db #782

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

Merged
aaannz merged 2 commits into from
May 14, 2026
Merged

Make uyuni-server dependent on uyuni-db #782

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
0d89378
Make uyuni-server dependent on uyuni-db
aaannz May 4, 2026
eb2d174
Require mount points for containers
aaannz May 4, 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
6 changes: 4 additions & 2 deletions mgradm/shared/templates/attestationServiceTemplate.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,8 +14,9 @@ const attestationServiceTemplate = `
# Use an uyuni-server-attestation.service.d/local.conf file to override
[Unit]
Description=Uyuni server attestation container service
Wants=network.target
After=network-online.target
Wants=network.target uyuni-db.service
After=network-online.target uyuni-db.service

[Service]
Environment=PODMAN_SYSTEMD_UNIT=%n
Restart=on-failure
Expand All @@ -41,6 +42,7 @@ PIDFile=%t/uyuni-server-attestation-%i.pid
TimeoutStopSec=60
TimeoutStartSec=60
Type=forking

[Install]
WantedBy=multi-user.target default.target
`
Expand Down
4 changes: 2 additions & 2 deletions mgradm/shared/templates/hubXmlrpcServiceTemplate.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,8 +16,8 @@ const hubXmlrpcServiceTemplate = `# uyuni-uyuni-hub-xmlrpc.service, generated by

[Unit]
Description=Uyuni Hub XMLRPC API container service
Wants=network.target
After=network-online.target
Wants=network.target uyuni-server.service
After=network-online.target uyuni-server.service

[Service]
Environment=PODMAN_SYSTEMD_UNIT=%n
Expand Down
1 change: 1 addition & 0 deletions mgradm/shared/templates/pgsqlServiceTemplate.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,6 +19,7 @@ Description=Uyuni database container service
Wants=network.target
After=network-online.target
RequiresMountsFor=%t/containers
RequiresMountsFor=%S/containers/storage/volumes/var-pgsql %S/containers/storage/volumes/var-pgsql-walbackup
Comment thread
aaannz marked this conversation as resolved.

[Service]
Environment=PODMAN_SYSTEMD_UNIT=%n
Expand Down
6 changes: 3 additions & 3 deletions mgradm/shared/templates/serviceTemplate.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,9 +16,9 @@ const serviceTemplate = `# uyuni-server.service, generated by mgradm

[Unit]
Description=Uyuni server image container service
Wants=network.target
After=network-online.target
RequiresMountsFor=%t/containers
Wants=network.target uyuni-db.service
After=network-online.target uyuni-db.service
RequiresMountsFor=%t/containers %S/containers/storage/volumes
Comment thread
aaannz marked this conversation as resolved.

[Service]
Environment=PODMAN_SYSTEMD_UNIT=%n
Expand Down
12 changes: 6 additions & 6 deletions mgradm/shared/templates/templates_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -100,9 +100,9 @@ func TestTemplatesRender(t *testing.T) {

[Unit]
Description=Uyuni server image container service
Wants=network.target
After=network-online.target
RequiresMountsFor=%t/containers
Wants=network.target uyuni-db.service
After=network-online.target uyuni-db.service
RequiresMountsFor=%t/containers %S/containers/storage/volumes

[Service]
Environment=PODMAN_SYSTEMD_UNIT=%n
Expand Down Expand Up @@ -188,9 +188,9 @@ WantedBy=multi-user.target default.target

[Unit]
Description=Uyuni server image container service
Wants=network.target
After=network-online.target
RequiresMountsFor=%t/containers
Wants=network.target uyuni-db.service
After=network-online.target uyuni-db.service
RequiresMountsFor=%t/containers %S/containers/storage/volumes

[Service]
Environment=PODMAN_SYSTEMD_UNIT=%n
Expand Down
5 changes: 2 additions & 3 deletions mgradm/shared/templates/tftpdServiceTemplate.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,9 +14,8 @@ const tftpdTemplate = `# uyuni-tftpd.service, generated by mgradm

[Unit]
Description=Uyuni tftpd container service
Wants=network.target
After=network-online.target
After=uyuni-server.service
Wants=network.target uyuni-server.service
After=network-online.target uyuni-server.service

[Service]
Environment=PODMAN_SYSTEMD_UNIT=%n
Expand Down
2 changes: 2 additions & 0 deletions uyuni-tools.changes.oholecek.add_weak_dependencies
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,2 @@
- Make uyuni-server service dependent on uyuni-db
(bsc#1263823)
Loading