foreman_maintain 1.7.1 → 1.7.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: ef8f53affe0970e853071b2568869c00aa94e850975b602538351cc9649dbc9e
-  data.tar.gz: 3a60a60c9be41bb3aa34a7abee49c4b7c66f6f91629986e2a0f5e31cac98e125
+  metadata.gz: 84b855d08a7d01c7df1b6e6df2f757418986c9eb33a1dda287d894099d0cd4a4
+  data.tar.gz: 5862df244ff4a6dfa7edf3dd348eb942c43854ab9ff11d20399af2dec99a4775
 SHA512:
-  metadata.gz: 68aa31aed572c7cec55cda60995e909f77b48028c9ed6708823b695d6373f07d3f94043eb5d8e4643f46f28363858bea362905a42f6ac7c1d8993ba6f6a5fc0d
-  data.tar.gz: c989d6302e5c47dcf4bb5465c8671af3a40ec497d56459765d67c600049a88476e9447c6fc4b2457b281942b65c881884ba55b6ea896e77a013765eda70879e2
+  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

@@ -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/version.rb

@@ -1,3 +1,3 @@
 module ForemanMaintain
-  VERSION = '1.7.1'.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.1
+  version: 1.7.2
 platform: ruby
 authors:
 - Ivan Nečas
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2024-08-21 00:00:00.000000000 Z
+date: 2024-08-26 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: clamp