Skip to content

Commit c1c116b

Browse files
Symorglasscbosdo
authored andcommitted
Integrated Salt event processor into mgradm install workflow
- Created service flag structure and implemented flag registration - Added container setup in mgradm install - Registered service
1 parent 5bd1e5c commit c1c116b

25 files changed

Lines changed: 312 additions & 6 deletions

File tree

mgradm/cmd/install/flags.go

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -29,6 +29,8 @@ func AddInstallFlags(cmd *cobra.Command) {
2929
_ = utils.AddFlagHelpGroup(cmd, &utils.Group{ID: "tftpd-container", Title: L("TFTPD Flags")})
3030
utils.AddTFTPDFlags(cmd, true, "tftpd-container")
3131

32+
cmd_utils.AddEventProcessorFlag(cmd, false)
33+
3234
cmd.Flags().String("admin-login", "admin", L("Administrator user name"))
3335
cmd.Flags().String("admin-password", "", L("Administrator password"))
3436
cmd.Flags().String("admin-firstName", "Administrator", L("First name of the administrator"))

mgradm/cmd/install/install.go

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -60,6 +60,7 @@ func getFlagsUpdater(flags *podmanInstallFlags) utils.FlagsUpdaterFunc {
6060
return func(v *viper.Viper) {
6161
flags.Coco.IsChanged = v.IsSet("coco.replicas")
6262
flags.HubXmlrpc.IsChanged = v.IsSet("hubxmlrpc.replicas")
63+
flags.EventProcessor.IsChanged = v.IsSet("eventprocessor.replicas")
6364
flags.Saline.IsChanged = v.IsSet("saline.replicas") || v.IsSet("saline.port")
6465
flags.TFTPD.IsChanged = v.IsSet("tftpd.enable")
6566

mgradm/cmd/install/utils.go

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -13,6 +13,7 @@ import (
1313
"github.com/spf13/cobra"
1414
"github.com/uyuni-project/uyuni-tools/mgradm/cmd/backup/db"
1515
"github.com/uyuni-project/uyuni-tools/mgradm/shared/coco"
16+
"github.com/uyuni-project/uyuni-tools/mgradm/shared/eventprocessor"
1617
"github.com/uyuni-project/uyuni-tools/mgradm/shared/hub"
1718
"github.com/uyuni-project/uyuni-tools/mgradm/shared/pgsql"
1819
"github.com/uyuni-project/uyuni-tools/mgradm/shared/podman"
@@ -115,6 +116,10 @@ func installForPodman(
115116
hub.SetupHubXmlrpc(systemd, authFile, flags.Image, flags.HubXmlrpc),
116117
saline.SetupSalineContainer(systemd, authFile, flags.Image, flags.Saline, flags.Installation.TZ),
117118
tftp.SetupTFTPContainer(systemd, authFile, flags.Image, flags.TFTPD, fqdn, false),
119+
eventprocessor.SetupEventProcessorContainer(
120+
systemd, authFile, flags.Image, flags.EventProcessor, flags.Installation.DB,
121+
flags.Installation.Debug.Java,
122+
),
118123
)
119124
}
120125

@@ -157,5 +162,6 @@ func setupDatabase(dbFlags types.DBFlags, reportdbFlags types.DBFlags, preparedI
157162
return err
158163
}
159164
}
165+
160166
return nil
161167
}

mgradm/cmd/restart/podman.go

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
// SPDX-FileCopyrightText: 2025 SUSE LLC
1+
// SPDX-FileCopyrightText: 2026 SUSE LLC
22
//
33
// SPDX-License-Identifier: Apache-2.0
44

@@ -24,5 +24,6 @@ func podmanRestart(
2424
systemd.RestartService(podman.ServerService),
2525
systemd.RestartInstantiated(podman.ServerAttestationService),
2626
systemd.RestartInstantiated(podman.HubXmlrpcService),
27+
systemd.RestartInstantiated(podman.EventProcessorService),
2728
)
2829
}

mgradm/cmd/status/podman.go

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -51,6 +51,13 @@ func podmanStatus(
5151
)
5252
}
5353

54+
for i := 0; i < systemd.CurrentReplicaCount(podman.EventProcessorService); i++ {
55+
println() // add an empty line between the previous logs and this one
56+
_ = utils.RunCmdStdMapping(
57+
zerolog.DebugLevel, "systemctl", "status", "--no-pager", fmt.Sprintf("%s@%d", podman.EventProcessorService, i),
58+
)
59+
}
60+
5461
if systemd.HasService(podman.TFTPService) {
5562
_ = utils.RunCmdStdMapping(zerolog.DebugLevel, "systemctl", "status", "--no-pager", podman.TFTPService)
5663
}

mgradm/cmd/support/ptf/utils.go

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -58,6 +58,7 @@ func ptfForPodman(
5858
flags.Coco,
5959
flags.HubXmlrpc,
6060
flags.Saline,
61+
flags.EventProcessor,
6162
flags.Pgsql,
6263
flags.TFTPD,
6364
flags.Installation.TZ,

mgradm/cmd/uninstall/podman.go

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -26,6 +26,7 @@ func uninstallForPodman(
2626
podman.GetServiceImage(podman.ServerService),
2727
podman.GetServiceImage(podman.ServerAttestationService + "@"),
2828
podman.GetServiceImage(podman.HubXmlrpcService + "@"),
29+
podman.GetServiceImage(podman.EventProcessorService + "@"),
2930
podman.GetServiceImage(podman.SalineService + "@"),
3031
podman.GetServiceImage(podman.DBService),
3132
podman.GetServiceImage(podman.TFTPService),
@@ -35,9 +36,9 @@ func uninstallForPodman(
3536
systemd.UninstallService("uyuni-server", !flags.Force)
3637
// Force stop the pod
3738
podman.DeleteContainer(podman.ServerContainerName, !flags.Force)
38-
3939
systemd.UninstallInstantiatedService(podman.ServerAttestationService, !flags.Force)
4040
systemd.UninstallInstantiatedService(podman.HubXmlrpcService, !flags.Force)
41+
systemd.UninstallInstantiatedService(podman.EventProcessorService, !flags.Force)
4142
systemd.UninstallInstantiatedService(podman.SalineService, !flags.Force)
4243
systemd.UninstallService(podman.DBService, !flags.Force)
4344
systemd.UninstallService(podman.TFTPService, !flags.Force)

mgradm/cmd/upgrade/flags.go

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -18,6 +18,7 @@ func AddUpgradeFlags(cmd *cobra.Command) {
1818
adm_utils.AddDBUpgradeImageFlag(cmd)
1919
adm_utils.AddUpgradeCocoFlag(cmd)
2020
adm_utils.AddUpgradeHubXmlrpcFlags(cmd)
21+
adm_utils.AddEventProcessorFlag(cmd, true)
2122
adm_utils.AddUpgradeSalineFlag(cmd)
2223
_ = utils.AddFlagHelpGroup(cmd, &utils.Group{ID: "tftpd-container", Title: L("TFTPD Flags")})
2324
utils.AddTFTPDFlags(cmd, true, "tftpd-container")

mgradm/cmd/upgrade/upgrade.go

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -35,6 +35,7 @@ func newCmd(globalFlags *types.GlobalFlags, run utils.CommandFunc[podmanUpgradeF
3535
flagsUpdater := func(v *viper.Viper) {
3636
flags.Coco.IsChanged = v.IsSet("coco.replicas")
3737
flags.HubXmlrpc.IsChanged = v.IsSet("hubxmlrpc.replicas")
38+
flags.EventProcessor.IsChanged = v.IsSet("eventprocessor.replicas")
3839
flags.Saline.IsChanged = v.IsSet("saline.replicas") || v.IsSet("saline.port")
3940
flags.TFTPD.IsChanged = v.IsSet("tftpd.enable")
4041
}

mgradm/cmd/upgrade/utils.go

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -44,6 +44,7 @@ func upgradePodman(_ *types.GlobalFlags, flags *podmanUpgradeFlags, cmd *cobra.C
4444
flags.Coco,
4545
flags.HubXmlrpc,
4646
flags.Saline,
47+
flags.EventProcessor,
4748
flags.Pgsql,
4849
flags.TFTPD,
4950
flags.Installation.TZ,

0 commit comments

Comments
 (0)