Merge pull request 'fix: handle the system-update process when openvox is disabled before the execution' (#187) from fix/handle-openvox-status into main

Reviewed-on: https://gitea.obmondo.com/EnableIT/Linuxaid-cli/pulls/187

Author: ashish1099

.gitea/workflows/release.yaml

@@ -26,7 +26,7 @@ jobs:
         uses: https://gitea.obmondo.com/Obmondo/goreleaser-action@v6.4.0
         with:
           version: "v2.12.7"
-          args: release --clean --skip=archive,publish -f .goreleaser-gitea.yaml
+          args: release --clean --skip=archive -f .goreleaser-gitea.yaml
         env:
           GITEA_TOKEN: ${{ secrets.GORELEASER_TOKEN }}
       - name: Upload to repo servers

.goreleaser-gitea.yaml

@@ -168,6 +168,10 @@ nfpms:
     bindir: /opt/obmondo/bin
     mtime: "{{ .CommitDate }}"
 
+release:
+  ids:
+    - default
+
 gitea_urls:
   api: https://gitea.obmondo.com/api/v1
   download: https://gitea.obmondo.com

cmd/linuxaid-cli/system-update.go

@@ -232,10 +232,12 @@ func SystemUpdate() {
 	slog.Info("starting system-update")
 
 	// check if agent disable file exists
+	openvoxInitiallyEnabled := true
 	if _, err := os.Stat(agentDisabledFile); err == nil {
-		slog.Warn("puppet has been disabled, exiting")
-		return
+		openvoxInitiallyEnabled = false
+		slog.Warn("openvox agent was disabled before system-update, will skip opnvox operations")
 	}
+
 	obmondoAPIURL := api.GetObmondoURL()
 	obmondoAPI := api.NewObmondoClient(obmondoAPIURL, false)
 
@@ -265,7 +267,7 @@ func SystemUpdate() {
 
 	puppetService := puppet.NewService(obmondoAPI, webtee.NewWebtee(obmondoAPI))
 
-	if !config.ShouldSkipOpenvox() {
+	if openvoxInitiallyEnabled && !config.ShouldSkipOpenvox() {
 		// Check if any existing puppet agent is already running
 		puppetService.WaitForAgent(constant.PuppetWaitForCertTimeOut)
 
@@ -311,9 +313,11 @@ func SystemUpdate() {
 
 	slog.Info("service window is closed now for this respective node")
 
-	// Enable the puppet agent, so puppet runs after reboot and don't exit the script
+	// Enable the openvox agent, so openvox runs after reboot and don't exit the script
 	// otherwise reboot won't be triggered
-	cleanup(puppetService)
+	if openvoxInitiallyEnabled {
+		cleanup(puppetService)
+	}
 
 	if err := CheckKernelAndRebootIfNeeded(); err != nil {
 		slog.Error("unable to check kernel and reboot", slog.String("error", err.Error()))

cmd/linuxaid-install/install.go

@@ -94,15 +94,16 @@ func Install() {
 	logger.InitLogger(pbWriter, config.IsDebug())
 
 	certname := helper.GetCertname()
-	puppetServer := config.GetPupeptServer()
+	openvoxServer := config.GetOpenvoxServer()
+	openvoxEnv := config.GetOpenvoxEnv()
 	obmondoAPIURL := api.GetObmondoURL()
 	obmondoAPI := api.NewObmondoClient(obmondoAPIURL, true)
 	webtee := webtee.NewWebtee(obmondoAPI)
 	puppetService := puppet.NewService(obmondoAPI, webtee)
 	provisioner := provisioner.NewService(obmondoAPI, puppetService, webtee)
 
 	webtee.RemoteLogObmondo([]string{"echo Starting Linuxaid Install Setup "}, certname)
-	prettyfmt.PrettyPrintf(" %s  %s %s %s %s\n", prettyfmt.IconGear, prettyfmt.FontWhite("Configuring Linuxaid on"), prettyfmt.FontYellow(certname), prettyfmt.FontWhite("with puppetserver"), prettyfmt.FontYellow(puppetServer))
+	prettyfmt.PrettyPrintf(" %s  %s %s %s %s %s %s\n", prettyfmt.IconGear, prettyfmt.FontWhite("Configuring Linuxaid on"), prettyfmt.FontYellow(certname), prettyfmt.FontWhite("with openvoxserver"), prettyfmt.FontYellow(openvoxServer), prettyfmt.FontWhite("and environment"), prettyfmt.FontYellow(openvoxEnv))
 	prettyfmt.PrettyPrintf(" %s  Running this tool will install and configure %s in your system.\n", prettyfmt.IconGear, prettyfmt.FontYellow("Openvox agent"))
 
 	if !shouldContinueAfterConfirmation() {

cmd/linuxaid-install/main.go

@@ -16,9 +16,10 @@ import (
 var Version string
 
 var (
-	debugFlag        bool
-	certNameFlag     string
-	puppetServerFlag string
+	debugFlag         bool
+	certNameFlag      string
+	openvoxServerFlag string
+	openvoxEnvFlag    string
 )
 
 var rootCmd = &cobra.Command{
@@ -68,21 +69,25 @@ func init() {
 
 	rootCmd.Flags().BoolVar(&debugFlag, "debug", false, "Enable debug logs")
 	rootCmd.Flags().StringVar(&certNameFlag, constant.CobraFlagCertname, "", "Certificate name (required)")
-	rootCmd.Flags().StringVar(&puppetServerFlag, constant.CobraFlagPuppetServer, defaultServer, "Puppet server hostname")
+	rootCmd.Flags().StringVar(&openvoxServerFlag, constant.CobraFlagOpenvoxServer, defaultServer, "Puppet server hostname")
+	rootCmd.Flags().StringVar(&openvoxEnvFlag, constant.CobraFlagOpenvoxEnv, constant.DefaultOpenvoxEnv, "Openvox environment (Linuxaid release version)")
 
 	// Bind flags to viper
 	v := config.GetViperInstance()
 	v.BindPFlag(constant.CobraFlagDebug, rootCmd.Flags().Lookup(constant.CobraFlagDebug))
 	v.BindPFlag(constant.CobraFlagCertname, rootCmd.Flags().Lookup(constant.CobraFlagCertname))
-	v.BindPFlag(constant.CobraFlagPuppetServer, rootCmd.Flags().Lookup(constant.CobraFlagPuppetServer))
+	v.BindPFlag(constant.CobraFlagOpenvoxServer, rootCmd.Flags().Lookup(constant.CobraFlagOpenvoxServer))
+	v.BindPFlag(constant.CobraFlagOpenvoxEnv, rootCmd.Flags().Lookup(constant.CobraFlagOpenvoxEnv))
 
 	// Bind environment variables
 	v.BindEnv(constant.CobraFlagDebug)
 	v.BindEnv(constant.CobraFlagCertname)
-	v.BindEnv(constant.CobraFlagPuppetServer, "PUPPET_SERVER")
+	v.BindEnv(constant.CobraFlagOpenvoxServer, "PUPPET_SERVER")
+	v.BindEnv(constant.CobraFlagOpenvoxEnv, "OPENVOX_ENVIRONMENT")
 
 	// Set default values
-	v.SetDefault(constant.CobraFlagPuppetServer, defaultServer)
+	v.SetDefault(constant.CobraFlagOpenvoxServer, defaultServer)
+	v.SetDefault(constant.CobraFlagOpenvoxEnv, constant.DefaultOpenvoxEnv)
 }
 
 func main() {

config/config.go

@@ -19,9 +19,14 @@ func GetCertname() string {
 	return viperConfig.GetString(constant.CobraFlagCertname)
 }
 
-func GetPupeptServer() string {
+func GetOpenvoxServer() string {
 	initIfNil()
-	return viperConfig.GetString(constant.CobraFlagPuppetServer)
+	return viperConfig.GetString(constant.CobraFlagOpenvoxServer)
+}
+
+func GetOpenvoxEnv() string {
+	initIfNil()
+	return viperConfig.GetString(constant.CobraFlagOpenvoxEnv)
 }
 
 func IsDebug() bool {

constant/constants.go

@@ -23,6 +23,7 @@ const (
 	AgentRunningLockFile            = "/opt/puppetlabs/puppet/cache/state/agent_catalog_run.lock"
 	DefaultPuppetServerCustomerID   = "enableit"
 	DefaultPuppetServerDomainSuffix = ".puppet.obmondo.com"
+	DefaultOpenvoxEnv               = "master"
 
 	// Progress Bar
 	BarProgressSize    = 100
@@ -36,11 +37,12 @@ const (
 	BarSizeHundred     = 100
 
 	// Cobra Flags
-	CobraFlagDebug        = "debug"
-	CobraFlagCertname     = "certname"
-	CobraFlagPuppetServer = "puppet-server"
-	CobraFlagNoReboot     = "no-reboot"
-	CobraFlagSkipOpenvox  = "skip-openvox"
+	CobraFlagDebug         = "debug"
+	CobraFlagCertname      = "certname"
+	CobraFlagOpenvoxServer = "puppet-server"
+	CobraFlagOpenvoxEnv    = "openvox-environment"
+	CobraFlagNoReboot      = "no-reboot"
+	CobraFlagSkipOpenvox   = "skip-openvox"
 
 	ObmondoEnv = "OBMONDO_ENV"
 )

pkg/puppet/puppet.go

@@ -22,20 +22,22 @@ import (
 )
 
 type Service struct {
-	webtee       *webtee.Webtee
-	apiClient    api.ObmondoClient
-	certName     string
-	puppetServer string
+	webtee        *webtee.Webtee
+	apiClient     api.ObmondoClient
+	certName      string
+	openvoxServer string
+	openvoxEnv    string
 }
 
 // NewService initializes a new Puppet service instance
 func NewService(apiClient api.ObmondoClient, webtee *webtee.Webtee) *Service {
 
 	return &Service{
-		apiClient:    apiClient,
-		certName:     helper.GetCertname(),
-		puppetServer: config.GetPupeptServer(),
-		webtee:       webtee,
+		apiClient:     apiClient,
+		certName:      helper.GetCertname(),
+		openvoxServer: config.GetOpenvoxServer(),
+		openvoxEnv:    config.GetOpenvoxEnv(),
+		webtee:        webtee,
 	}
 }
 
@@ -140,9 +142,9 @@ masterport = 443
 report = true
 pluginsync = true
 noop = true
-environment = master
+environment = %s
 `
-	content := fmt.Sprintf(cfg, s.puppetServer, s.certName)
+	content := fmt.Sprintf(cfg, s.openvoxServer, s.certName, s.openvoxEnv)
 	if _, err := script.Echo(content).WriteFile(constant.PuppetConfig); err != nil {
 		s.webtee.RemoteLogObmondo([]string{fmt.Sprintf("echo failed to configure puppet: %s", err)}, s.certName)
 		os.Exit(1)
@@ -151,7 +153,7 @@ environment = master
 
 // Check server status
 func (s *Service) CheckServerStatus() error {
-	url := fmt.Sprintf("https://%s/status/v1/services", s.puppetServer)
+	url := fmt.Sprintf("https://%s/status/v1/services", s.openvoxServer)
 	client := &http.Client{
 		Transport: &http.Transport{
 			TLSClientConfig: &tls.Config{InsecureSkipVerify: true},