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

mbussolotto · mbussolotto · commit 0d040c69e70f · 2025-06-03T15:46:24.000+02:00
diff --git a/mgradm/cmd/scale/scale.go b/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 {
diff --git a/mgradm/cmd/uninstall/podman.go b/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
diff --git a/mgradm/shared/podman/startstop.go b/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),
 	)
diff --git a/mgradm/shared/saline/saline.go b/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"))
 	}
diff --git a/shared/podman/systemd.go b/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)
 			}
diff --git a/uyuni-tools.changes.mbussolotto.saline b/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)

Original file line number	Diff line number	Diff line change
`@@ -14,6 +14,7 @@ func StartServices() error {`
`14`	`14`	`systemd.StartService(podman.DBService),`
`15`	`15`	`systemd.StartInstantiated(podman.ServerAttestationService),`
`16`	`16`	`systemd.StartInstantiated(podman.HubXmlrpcService),`
	`17`	`+ systemd.StartInstantiated(podman.SalineService),`
`17`	`18`	`systemd.StartService(podman.ServerService),`
`18`	`19`	`)`
`19`	`20`	`}`
`@@ -22,6 +23,7 @@ func StopServices() error {`
`22`	`23`	`return utils.JoinErrors(`
`23`	`24`	`systemd.StopInstantiated(podman.ServerAttestationService),`
`24`	`25`	`systemd.StopInstantiated(podman.HubXmlrpcService),`
	`26`	`+ systemd.StopInstantiated(podman.SalineService),`
`25`	`27`	`systemd.StopService(podman.ServerService),`
`26`	`28`	`systemd.StopService(podman.DBService),`
`27`	`29`	`)`
Original file line number	Diff line number	Diff line change
`@@ -107,7 +107,7 @@ func writeSalineServiceFiles(`
`107`	`107`	config := fmt.Sprintf(`Environment=TZ=%s
`108`	`108`	`, strings.TrimSpace(tz))
`109`	`109`
`110`		`- if err := podman.GenerateSystemdConfFile(podman.SalineService, "custom.conf",`
	`110`	`+ if err := podman.GenerateSystemdConfFile(podman.SalineService+"@", "custom.conf",`
`111`	`111`	`config, false); err != nil {`
`112`	`112`	`return utils.Error(err, L("cannot generate systemd user configuration file"))`
`113`	`113`	`}`
Original file line number	Diff line number	Diff line change
`@@ -111,7 +111,7 @@ func (s SystemdImpl) UninstallService(name string, dryRun bool) {`
`111`	`111`	`} else {`
`112`	`112`	`log.Info().Msgf(L("Disable %s service"), name)`
`113`	`113`	`// disable server`
`114`		`- err := utils.RunCmd("systemctl", "disable", "--now", name)`
	`114`	`+ err := s.DisableService(name)`
`115`	`115`	`if err != nil {`
`116`	`116`	`log.Error().Err(err).Msgf(L("Failed to disable %s service"), name)`
`117`	`117`	`}`
Original file line number	Diff line number	Diff line change
`@@ -0,0 +1,2 @@`
	`1`	`+- fix several bugs related to saline service (bsc#1243329)`
	`2`	`+- purge saline and hubxmlrpc image (bsc#1243359)`