Skip to content
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.

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

podman upgrade fixes #491

Merged
merged 2 commits into from
Nov 13, 2024
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
3 changes: 3 additions & 0 deletions mgradm/shared/coco/coco.go
Original file line number Diff line number Diff line change
Expand Up @@ -39,6 +39,9 @@ func Upgrade(
return err
}

if !cocoFlags.IsChanged {
return systemd.RestartInstantiated(podman.ServerAttestationService)
}
return systemd.ScaleService(cocoFlags.Replicas, podman.ServerAttestationService)
}

Expand Down
7 changes: 4 additions & 3 deletions mgradm/shared/hub/xmlrpcapi.go
Original file line number Diff line number Diff line change
Expand Up @@ -72,8 +72,6 @@ func EnableHubXmlrpc(systemd podman.Systemd, replicas int) error {
if err := systemd.ScaleService(replicas, podman.HubXmlrpcService); err != nil {
return utils.Errorf(err, L("cannot enable service"))
}
} else {
log.Info().Msg(L("Not starting Hub XML-RPC API service"))
}
return nil
}
Expand All @@ -99,7 +97,10 @@ func Upgrade(
return err
}

return systemd.RestartInstantiated(podman.HubXmlrpcService)
if !hubXmlrpcFlags.IsChanged {
return systemd.RestartInstantiated(podman.HubXmlrpcService)
}
return systemd.ScaleService(hubXmlrpcFlags.Replicas, podman.HubXmlrpcService)
}

// generateHubXmlrpcSystemdService creates the Hub XMLRPC systemd files.
Expand Down
4 changes: 4 additions & 0 deletions mgradm/shared/podman/podman.go
Original file line number Diff line number Diff line change
Expand Up @@ -434,6 +434,10 @@ func Upgrade(
return err
}

if err := systemd.ReloadDaemon(false); err != nil {
return err
}

if err := updateServerSystemdService(); err != nil {
return err
}
Expand Down
2 changes: 2 additions & 0 deletions uyuni-tools.changes.cbosdo.upgrade-fix
Original file line number Diff line number Diff line change
@@ -0,0 +1,2 @@
- Run systemctl daemon-reload after changing the container image config (bsc#1233279)
- coco-replicas-upgrade