Merge pull request #601 from mbussolotto/enable_saline

saline container fails to start if server is not up and running

Author: mbussolotto

mgradm/cmd/install/podman/utils.go

@@ -117,25 +117,6 @@ func installForPodman(
 		return err
 	}
 
-	if err := coco.SetupCocoContainer(
-		systemd, authFile, flags.Image.Registry, flags.Coco, flags.Image,
-		flags.Installation.DB,
-	); err != nil {
-		return err
-	}
-
-	if err := hub.SetupHubXmlrpc(
-		systemd, authFile, flags.Image.Registry, flags.Image.PullPolicy, flags.Image.Tag, flags.HubXmlrpc,
-	); err != nil {
-		return err
-	}
-
-	if err := saline.SetupSalineContainer(
-		systemd, authFile, flags.Image.Registry, flags.Saline, flags.Image, flags.Installation.TZ,
-	); err != nil {
-		return err
-	}
-
 	cnx := shared.NewConnection("podman", shared_podman.ServerContainerName, "")
 	if err := podman.WaitForSystemStart(systemd, cnx, preparedImage, flags.Installation.TZ,
 		flags.Installation.Debug.Java, flags.Mirror, flags.Podman.Args); err != nil {
@@ -155,6 +136,25 @@ func installForPodman(
 	if err := shared_podman.EnablePodmanSocket(); err != nil {
 		return utils.Error(err, L("cannot enable podman socket"))
 	}
+
+	if err := coco.SetupCocoContainer(
+		systemd, authFile, flags.Image.Registry, flags.Coco, flags.Image,
+		flags.Installation.DB,
+	); err != nil {
+		return err
+	}
+
+	if err := hub.SetupHubXmlrpc(
+		systemd, authFile, flags.Image.Registry, flags.Image.PullPolicy, flags.Image.Tag, flags.HubXmlrpc,
+	); err != nil {
+		return err
+	}
+
+	if err := saline.SetupSalineContainer(
+		systemd, authFile, flags.Image.Registry, flags.Saline, flags.Image, flags.Installation.TZ,
+	); err != nil {
+		return err
+	}
 	return nil
 }
 

shared/podman/systemd.go

@@ -386,5 +386,5 @@ func (s SystemdImpl) ScaleService(replicas int, name string) error {
 			return utils.Errorf(err, L("cannot disable service"))
 		}
 	}
-	return nil
+	return s.RestartInstantiated(name)
 }

uyuni-tools.changes.mbussolotto.enable_saline

@@ -0,0 +1,2 @@
+- Start saline containers and the other after
+  server is running