foreman_maintain 1.7.1 → 1.7.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: ef8f53affe0970e853071b2568869c00aa94e850975b602538351cc9649dbc9e
-  data.tar.gz: 3a60a60c9be41bb3aa34a7abee49c4b7c66f6f91629986e2a0f5e31cac98e125
+  metadata.gz: e3e15401e01712537566856184b187a132a0c3db2634955d8688875ba4c2ca01
+  data.tar.gz: 5e0bcafc241cf70f128ebe6fe887b50b83dd265311fec601360f92bbd2760751
 SHA512:
-  metadata.gz: 68aa31aed572c7cec55cda60995e909f77b48028c9ed6708823b695d6373f07d3f94043eb5d8e4643f46f28363858bea362905a42f6ac7c1d8993ba6f6a5fc0d
-  data.tar.gz: c989d6302e5c47dcf4bb5465c8671af3a40ec497d56459765d67c600049a88476e9447c6fc4b2457b281942b65c881884ba55b6ea896e77a013765eda70879e2
+  metadata.gz: c6344eb03b0caec004ebd5920bd7d416535000379361146680af2e1870d28a98816403210bcc8db78dc18be27c2d8559400fbc0c7160f5e8c680923f833b4eb6
+  data.tar.gz: cd87120311bedea2789b1ccf9db5b16ae8b81282eb0d49ac9e053f19b4702328dca9a502e4788898fd47330122dca3014dabf579f02a8e885c24685c72fd619c

data/definitions/checks/pulpcore/no_running_tasks.rb

@@ -2,6 +2,9 @@ module Checks::Pulpcore
   class NoRunningTasks < ForemanMaintain::Check
     metadata do
       for_feature :pulpcore
+      confine do
+        feature(:pulpcore)&.cli_available?
+      end
       description 'Check for running pulpcore tasks'
       tags :pre_upgrade
       param :wait_for_tasks,

data/definitions/features/pulpcore.rb

@@ -6,6 +6,7 @@ class Features::Pulpcore < ForemanMaintain::Feature
   TIMEOUT_FOR_TASKS_STATUS = 300
   RETRY_INTERVAL_FOR_TASKS_STATE = 10
   PULP_SETTINGS = '/etc/pulp/settings.py'.freeze
+  PULP_CLI_SETTINGS = '/etc/pulp/cli.toml'.freeze
 
   metadata do
     label :pulpcore
@@ -15,6 +16,10 @@ class Features::Pulpcore < ForemanMaintain::Feature
     end
   end
 
+  def cli_available?
+    File.exist?(PULP_CLI_SETTINGS)
+  end
+
   def cli(args)
     parse_json(execute("pulp --format json #{args}"))
   end

data/definitions/procedures/crond/start.rb

@@ -6,7 +6,7 @@ module Procedures::Crond
       description 'Start cron service'
 
       for_feature :cron
-      tags :post_migrations, :maintenance_mode_off
+      tags :post_migrations
 
       after :iptables_remove_maintenance_mode_chain
       advanced_run false

data/definitions/procedures/crond/stop.rb

@@ -4,7 +4,7 @@ module Procedures::Crond
   class Stop < Procedures::Service::Base
     metadata do
       description 'Stop cron service'
-      tags :pre_migrations, :maintenance_mode_on
+      tags :pre_migrations
       for_feature :cron
 
       after :iptables_add_maintenance_mode_chain

data/definitions/procedures/maintenance_mode/disable_maintenance_mode.rb

@@ -4,7 +4,7 @@ module Procedures::MaintenanceMode
     metadata do
       label :disable_maintenance_mode
       description 'Remove maintenance mode table/chain from nftables/iptables'
-      tags :post_migrations, :maintenance_mode_off
+      tags :post_migrations
       after :sync_plans_enable
     end
 

data/definitions/procedures/maintenance_mode/enable_maintenance_mode.rb

@@ -4,7 +4,7 @@ module Procedures::MaintenanceMode
     metadata do
       label :enable_maintenance_mode
       description 'Add maintenance_mode tables/chain to nftables/iptables'
-      tags :pre_migrations, :maintenance_mode_on
+      tags :pre_migrations
       after :sync_plans_disable
     end
 

data/definitions/scenarios/maintenance_mode.rb

@@ -8,7 +8,9 @@ module ForemanMaintain::Scenarios
     end
 
     def compose
-      add_steps(find_procedures(:maintenance_mode_on))
+      add_step(Procedures::MaintenanceMode::EnableMaintenanceMode)
+      add_step(Procedures::Crond::Stop)
+      add_step(Procedures::SyncPlans::Disable)
     end
   end
 
@@ -21,7 +23,9 @@ module ForemanMaintain::Scenarios
     end
 
     def compose
-      add_steps(find_procedures(:maintenance_mode_off))
+      add_step(Procedures::SyncPlans::Enable)
+      add_step(Procedures::Crond::Start)
+      add_step(Procedures::MaintenanceMode::DisableMaintenanceMode)
     end
   end
 

data/lib/foreman_maintain/cli/update_command.rb

@@ -19,6 +19,27 @@ module ForemanMaintain
         update_runner
       end
 
+      def try_update
+        if update_runner.available?
+          yield
+        else
+          instance = ForemanMaintain.detector.feature(:instance)
+          msg = <<~BANNER
+
+            This version of #{ForemanMaintain.command_name} only supports #{instance.target_version},
+            but the installed version of #{instance.product_name} is #{instance.current_major_version}.
+
+            Therefore the update command is not available right now.
+
+            Please install a version of #{ForemanMaintain.command_name} that supports #{instance.current_major_version}
+            or perform an upgrade to #{instance.target_version} using the upgrade command.
+          BANNER
+
+          puts msg
+          ForemanMaintain::UpdateRunner::WARNING_EXIT_CODE
+        end
+      end
+
       subcommand 'check', 'Run pre-update checks before updating' do
         interactive_option
         disable_self_update_option
@@ -26,9 +47,14 @@ module ForemanMaintain
         def execute
           ForemanMaintain.validate_downstream_packages
           ForemanMaintain.perform_self_upgrade unless disable_self_update?
-          runner = update_runner
-          runner.run_phase(:pre_update_checks)
-          exit runner.exit_code
+
+          exit_code = try_update do
+            runner = update_runner
+            runner.run_phase(:pre_update_checks)
+            runner.exit_code
+          end
+
+          exit exit_code
         end
       end
 
@@ -39,10 +65,15 @@ module ForemanMaintain
         def execute
           ForemanMaintain.validate_downstream_packages
           ForemanMaintain.perform_self_upgrade unless disable_self_update?
-          runner = update_runner
-          runner.run
-          runner.save
-          exit runner.exit_code
+
+          exit_code = try_update do
+            runner = update_runner
+            runner.run
+            runner.save
+            runner.exit_code
+          end
+
+          exit exit_code
         end
       end
     end

data/lib/foreman_maintain/update_runner.rb

@@ -18,6 +18,12 @@ module ForemanMaintain
       self.phase = :pre_update_checks
     end
 
+    def available?
+      condition = { :tags => [:update_scenario, :pre_update_checks] }
+      matching_scenarios = find_scenarios(condition)
+      !matching_scenarios.empty?
+    end
+
     def find_scenario(phase)
       return @scenario_cache[phase] if @scenario_cache.key?(phase)
 

data/lib/foreman_maintain/version.rb

@@ -1,3 +1,3 @@
 module ForemanMaintain
-  VERSION = '1.7.1'.freeze
+  VERSION = '1.7.3'.freeze
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: foreman_maintain
 version: !ruby/object:Gem::Version
-  version: 1.7.1
+  version: 1.7.3
 platform: ruby
 authors:
 - Ivan Nečas
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2024-08-21 00:00:00.000000000 Z
+date: 2024-08-29 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: clamp