foreman_maintain 1.7.0 → 1.7.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 4c920bd300687cf40bdcfaa045a8e185d838c5c6a28a397456f033cb0fc7b920
-  data.tar.gz: 5bdd2f964f86683efd0c462f383fc1e39ea4e4c28d1e30cb998a88bd6447b0b9
+  metadata.gz: 84b855d08a7d01c7df1b6e6df2f757418986c9eb33a1dda287d894099d0cd4a4
+  data.tar.gz: 5862df244ff4a6dfa7edf3dd348eb942c43854ab9ff11d20399af2dec99a4775
 SHA512:
-  metadata.gz: 845ce94787435fa1b731aba0e3ae5da8ccde750113e1cf967dd006a0f1d3483883a7625523fb0ad922bbfc28b1a67dcbf0f2d944dff6e952ff763eb1e32137e8
-  data.tar.gz: 3551e01ecf107deb7608e2f5a250f0789c8681de3917b2bf04b7d1856385d939eb2cb61a9dd4f39ec5e42b7f2d6a5fffe6ae99ad2f8ec29e73098602483a2517
+  metadata.gz: 0422c2363fdb4fdd3b692205ce0db20f2b603c7a65efe3d7f30c8d1654036c5e6a344a0d8d4bdc1bc400b42eaf7e4eeca9ab0c799ceee5ad3cd1b60febe93c87
+  data.tar.gz: d983619c591e737257078a6b8f2cb15cc15bb3bc9227c6a8ae413b5742eeecc2d7f1e57544659ee4e3c23cf83eb553e83d1a5af3fd552115da3ee9864c714dd9

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

@@ -5,9 +5,19 @@ 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
+
+    confine do
+      File.exist?(PULP_SETTINGS)
+    end
+  end
+
+  def cli_available?
+    File.exist?(PULP_CLI_SETTINGS)
   end
 
   def cli(args)
@@ -49,7 +59,7 @@ class Features::Pulpcore < ForemanMaintain::Feature
 
   def config_files
     [
-      '/etc/pulp/settings.py',
+      PULP_SETTINGS,
       '/etc/pulp/certs/database_fields.symmetric.key',
     ]
   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/upgrade_runner.rb

@@ -44,7 +44,7 @@ module ForemanMaintain
     end
 
     def available?
-      condition = { :tags => [:upgrade_scenario, :pre_upgrade_check] }
+      condition = { :tags => [:upgrade_scenario, :pre_upgrade_checks] }
       matching_scenarios = find_scenarios(condition)
       !matching_scenarios.empty?
     end

data/lib/foreman_maintain/version.rb

@@ -1,3 +1,3 @@
 module ForemanMaintain
-  VERSION = '1.7.0'.freeze
+  VERSION = '1.7.2'.freeze
 end

metadata

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