Merge pull request #587 from mbussolotto/saline

fix several bugs related to saline service (bsc#1243329) (bsc#1243359)

Author: mbussolotto

mgradm/cmd/scale/scale.go

@@ -1,4 +1,4 @@
-// SPDX-FileCopyrightText: 2024 SUSE LLC
+// SPDX-FileCopyrightText: 2025 SUSE LLC
 //
 // SPDX-License-Identifier: Apache-2.0
 
@@ -28,8 +28,9 @@ func newCmd(globalFlags *types.GlobalFlags, run utils.CommandFunc[scaleFlags]) *
 		Short:   L("Adjust the replicas for services supporting it."),
 		Long: L(`Adjust the replicas for services supporting it.
 Supported services:
-  - uyuni-server-attestation
   - uyuni-hub-xmlrpc
+  - uyuni-saline
+  - uyuni-server-attestation
 `),
 		Args: cobra.ExactArgs(1),
 		RunE: func(cmd *cobra.Command, args []string) error {

mgradm/cmd/uninstall/podman.go

@@ -25,8 +25,8 @@ func uninstallForPodman(
 	images := []string{
 		podman.GetServiceImage(podman.ServerService),
 		podman.GetServiceImage(podman.ServerAttestationService + "@"),
-		podman.GetServiceImage(podman.HubXmlrpcService),
-		podman.GetServiceImage(podman.SalineService),
+		podman.GetServiceImage(podman.HubXmlrpcService + "@"),
+		podman.GetServiceImage(podman.SalineService + "@"),
 		podman.GetServiceImage(podman.DBService),
 	}
 
@@ -37,7 +37,7 @@ func uninstallForPodman(
 
 	systemd.UninstallInstantiatedService(podman.ServerAttestationService, !flags.Force)
 	systemd.UninstallInstantiatedService(podman.HubXmlrpcService, !flags.Force)
-	systemd.UninstallService(podman.SalineService, !flags.Force)
+	systemd.UninstallInstantiatedService(podman.SalineService, !flags.Force)
 	systemd.UninstallService(podman.DBService, !flags.Force)
 
 	// Remove the volumes

mgradm/shared/podman/startstop.go

@@ -14,6 +14,7 @@ func StartServices() error {
 		systemd.StartService(podman.DBService),
 		systemd.StartInstantiated(podman.ServerAttestationService),
 		systemd.StartInstantiated(podman.HubXmlrpcService),
+		systemd.StartInstantiated(podman.SalineService),
 		systemd.StartService(podman.ServerService),
 	)
 }
@@ -22,6 +23,7 @@ func StopServices() error {
 	return utils.JoinErrors(
 		systemd.StopInstantiated(podman.ServerAttestationService),
 		systemd.StopInstantiated(podman.HubXmlrpcService),
+		systemd.StopInstantiated(podman.SalineService),
 		systemd.StopService(podman.ServerService),
 		systemd.StopService(podman.DBService),
 	)

mgradm/shared/saline/saline.go

@@ -107,7 +107,7 @@ func writeSalineServiceFiles(
 	config := fmt.Sprintf(`Environment=TZ=%s
 `, strings.TrimSpace(tz))
 
-	if err := podman.GenerateSystemdConfFile(podman.SalineService, "custom.conf",
+	if err := podman.GenerateSystemdConfFile(podman.SalineService+"@", "custom.conf",
 		config, false); err != nil {
 		return utils.Error(err, L("cannot generate systemd user configuration file"))
 	}

shared/podman/systemd.go

@@ -111,7 +111,7 @@ func (s SystemdImpl) UninstallService(name string, dryRun bool) {
 		} else {
 			log.Info().Msgf(L("Disable %s service"), name)
 			// disable server
-			err := utils.RunCmd("systemctl", "disable", "--now", name)
+			err := s.DisableService(name)
 			if err != nil {
 				log.Error().Err(err).Msgf(L("Failed to disable %s service"), name)
 			}

uyuni-tools.changes.mbussolotto.saline

@@ -0,0 +1,2 @@
+- fix several bugs related to saline service (bsc#1243329)
+- purge saline and hubxmlrpc image (bsc#1243359)