foreman_maintain 1.6.14 → 1.7.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 0e0b033f2189945ae0f5b3a005ee7513d7046f958ffa8bb8693ddc2c95521db1
-  data.tar.gz: 62ca2e1a8404fa3d30309feceafc53d659519f4595ab60cecbde58ad8e69290c
+  metadata.gz: ef8f53affe0970e853071b2568869c00aa94e850975b602538351cc9649dbc9e
+  data.tar.gz: 3a60a60c9be41bb3aa34a7abee49c4b7c66f6f91629986e2a0f5e31cac98e125
 SHA512:
-  metadata.gz: a6f47ab3d231627d634fc8ce93d31853de8da33bb84ac02c483077bb71270bb413d90e9f721820237227c2ea6e3bdeb3df2bb610f33c8a9e5cae67e4bd13a73c
-  data.tar.gz: ad2f03840152f21a868b881973267fc48e511c8c48115666b5b5cfc4685c753bb18f27c4a6f476dda624f7ee0c69f57a1702759b7a0c3a5b874034bda04df90b
+  metadata.gz: 68aa31aed572c7cec55cda60995e909f77b48028c9ed6708823b695d6373f07d3f94043eb5d8e4643f46f28363858bea362905a42f6ac7c1d8993ba6f6a5fc0d
+  data.tar.gz: c989d6302e5c47dcf4bb5465c8671af3a40ec497d56459765d67c600049a88476e9447c6fc4b2457b281942b65c881884ba55b6ea896e77a013765eda70879e2

data/config/foreman_maintain.yml.example

@@ -31,7 +31,7 @@
 
 # Mention true/false.
 # Value true will to enable cron service stop/restart on maintenance-mode start/stop
-# :manage_crond: false
+# :manage_crond: true
 
 # URL of the Foreman/Satellite server
 # :foreman_url:

data/config/foreman_maintain.yml.packaging

@@ -28,4 +28,4 @@
 
 # Mention true/false.
 # Value true will to enable cron service stop/restart on maintenance-mode start/stop
-# :manage_crond: false
+# :manage_crond: true

data/definitions/checks/foreman_tasks/not_running.rb

@@ -6,17 +6,17 @@ module Checks::ForemanTasks
       tags :pre_upgrade
       after :foreman_tasks_not_paused
       before :check_old_foreman_tasks
+      param :wait_for_tasks,
+        'Wait for tasks to finish or fail directly',
+        :required => false,
+        :default => true
     end
 
     def run
       task_count = feature(:foreman_tasks).running_tasks_count
       assert(task_count == 0,
         failure_message(task_count),
-        :next_steps =>
-          [Procedures::ForemanTasks::FetchTasksStatus.new(:state => 'running'),
-           Procedures::ForemanTasks::UiInvestigate.new(
-             'search_query' => search_query_for_running_tasks
-           )])
+        :next_steps => calculate_next_steps)
     end
 
     private
@@ -30,5 +30,18 @@ module Checks::ForemanTasks
       "There are #{task_count} active task(s) in the system." \
       "\nPlease wait for these to complete or cancel them from the Monitor tab."
     end
+
+    def calculate_next_steps
+      steps = []
+      if @wait_for_tasks
+        steps << Procedures::ForemanTasks::FetchTasksStatus.new(:state => 'running')
+        unless assumeyes?
+          steps << Procedures::ForemanTasks::UiInvestigate.new(
+            'search_query' => search_query_for_running_tasks
+          )
+        end
+      end
+      steps
+    end
   end
 end

data/definitions/checks/maintenance_mode/check_consistency.rb

@@ -48,7 +48,7 @@ module Checks::MaintenanceMode
     end
 
     def check_for_cron(is_mode_on)
-      unless ForemanMaintain.config.manage_crond && feature(:cron)
+      unless feature(:cron)
         return ['cron jobs: not managed', []]
       end
 

data/definitions/checks/pulpcore/no_running_tasks.rb

@@ -0,0 +1,34 @@
+module Checks::Pulpcore
+  class NoRunningTasks < ForemanMaintain::Check
+    metadata do
+      for_feature :pulpcore
+      description 'Check for running pulpcore tasks'
+      tags :pre_upgrade
+      param :wait_for_tasks,
+        'Wait for tasks to finish or fail directly',
+        :required => false
+    end
+
+    def run
+      tasks = feature(:pulpcore).running_tasks
+      assert(
+        tasks.empty?,
+        failure_message(tasks.length),
+        :next_steps => calculate_next_steps
+      )
+    end
+
+    private
+
+    def failure_message(task_count)
+      <<~MSG
+        There are #{task_count} active task(s) in the system.
+        Please wait for these to complete.
+      MSG
+    end
+
+    def calculate_next_steps
+      @wait_for_tasks ? [Procedures::Pulpcore::WaitForTasks.new] : []
+    end
+  end
+end

data/definitions/features/cron.rb

@@ -2,7 +2,7 @@ class Features::Cron < ForemanMaintain::Feature
   metadata do
     label :cron
     confine do
-      ForemanMaintain.config.manage_crond && feature(:instance).downstream
+      ForemanMaintain.config.manage_crond
     end
   end
 

data/definitions/features/dynflow_sidekiq.rb

@@ -20,6 +20,10 @@ class Features::DynflowSidekiq < ForemanMaintain::Feature
     end
   end
 
+  def workers
+    services.reject { |service| service.name.end_with?('@orchestrator') }
+  end
+
   private
 
   def instance_priority(instance)

data/definitions/features/instance.rb

@@ -101,6 +101,10 @@ class Features::Instance < ForemanMaintain::Feature
     version.to_s[/^\d+\.\d+\.\d+/]
   end
 
+  def current_major_version
+    current_version.to_s[/^\d+\.\d+/]
+  end
+
   def target_version
     if feature(:instance).downstream
       Features::Satellite.new.target_version

data/definitions/features/pulpcore.rb

@@ -3,8 +3,37 @@ require 'foreman_maintain/utils/service/systemd'
 class Features::Pulpcore < ForemanMaintain::Feature
   include ForemanMaintain::Concerns::PulpCommon
 
+  TIMEOUT_FOR_TASKS_STATUS = 300
+  RETRY_INTERVAL_FOR_TASKS_STATE = 10
+  PULP_SETTINGS = '/etc/pulp/settings.py'.freeze
+
   metadata do
     label :pulpcore
+
+    confine do
+      File.exist?(PULP_SETTINGS)
+    end
+  end
+
+  def cli(args)
+    parse_json(execute("pulp --format json #{args}"))
+  end
+
+  def running_tasks
+    cli('task list --state-in running --state-in canceling')
+  end
+
+  def wait_for_tasks(spinner, timeout_for_tasks_status = TIMEOUT_FOR_TASKS_STATUS)
+    Timeout.timeout(timeout_for_tasks_status) do
+      while (task_count = running_tasks.length) != 0
+        puts "\nThere are #{task_count} tasks."
+        spinner.update "Waiting #{RETRY_INTERVAL_FOR_TASKS_STATE} seconds before retry."
+        sleep RETRY_INTERVAL_FOR_TASKS_STATE
+      end
+    end
+  rescue Timeout::Error => e
+    logger.error(e.message)
+    puts "\nTimeout: #{e.message}. Try again."
   end
 
   def services
@@ -25,7 +54,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/pulpcore/wait_for_tasks.rb

@@ -0,0 +1,15 @@
+module Procedures::Pulpcore
+  class WaitForTasks < ForemanMaintain::Procedure
+    metadata do
+      for_feature :pulpcore
+      description 'Fetch tasks status and wait till they finish'
+      advanced_run false
+    end
+
+    def run
+      with_spinner("waiting for tasks to finish") do |spinner|
+        feature(:pulpcore).wait_for_tasks(spinner)
+      end
+    end
+  end
+end

data/definitions/scenarios/backup.rb

@@ -13,13 +13,15 @@ module ForemanMaintain::Scenarios
       param :proxy_features, 'List of proxy features to backup (default: all)', :array => true
       param :skip_pulp_content, 'Skip Pulp content during backup'
       param :tar_volume_size, 'Size of tar volume (indicates splitting)'
+      param :wait_for_tasks, 'Wait for running tasks to complete instead of aborting'
     end
 
     def compose
       check_valid_strategy
       add_step_with_context(Checks::Backup::IncrementalParentType,
         :online_backup => strategy == :online)
-      safety_confirmation
+      add_step(Checks::ForemanTasks::NotRunning.new(:wait_for_tasks => wait_for_tasks?))
+      add_step(Checks::Pulpcore::NoRunningTasks.new(:wait_for_tasks => wait_for_tasks?))
       add_step_with_context(Procedures::Backup::AccessibilityConfirmation) if strategy == :offline
       add_step_with_context(Procedures::Backup::PrepareDirectory)
       add_step_with_context(Procedures::Backup::Metadata, :online_backup => strategy == :online)
@@ -62,12 +64,6 @@ module ForemanMaintain::Scenarios
 
     private
 
-    def safety_confirmation
-      if strategy == :online
-        add_step_with_context(Procedures::Backup::Online::SafetyConfirmation)
-      end
-    end
-
     def check_valid_strategy
       unless [:online, :offline].include? strategy
         raise ArgumentError, "Unsupported strategy '#{strategy}'"
@@ -92,6 +88,8 @@ module ForemanMaintain::Scenarios
     end
 
     def add_online_backup_steps
+      add_step(Procedures::Service::Stop.new(:only => online_workers)) unless online_workers.empty?
+
       add_step_with_context(Procedures::Backup::ConfigFiles, :ignore_changed_files => true,
         :online_backup => true)
       add_step_with_context(Procedures::Backup::Pulp, :ensure_unchanged => true)
@@ -104,11 +102,24 @@ module ForemanMaintain::Scenarios
         Procedures::Backup::Online::ForemanDB,
         Procedures::Backup::Online::PulpcoreDB
       )
+
+      add_step(Procedures::Service::Start.new(:only => online_workers)) unless online_workers.empty?
     end
 
     def strategy
       context.get(:strategy)
     end
+
+    def wait_for_tasks?
+      !!context.get(:wait_for_tasks)
+    end
+
+    def online_workers
+      services = []
+      services += feature(:dynflow_sidekiq).workers if feature(:dynflow_sidekiq)
+      services += feature(:pulpcore).configured_workers if feature(:pulpcore)
+      services
+    end
   end
 
   class BackupRescueCleanup < ForemanMaintain::Scenario
@@ -122,9 +133,7 @@ module ForemanMaintain::Scenarios
     end
 
     def compose
-      if strategy == :offline
-        add_step_with_context(Procedures::Service::Start)
-      end
+      add_step_with_context(Procedures::Service::Start)
       add_step_with_context(Procedures::Backup::Clean)
     end
 
@@ -134,11 +143,5 @@ module ForemanMaintain::Scenarios
       context.map(:preserve_dir,
         Procedures::Backup::Clean => :preserve_dir)
     end
-
-    private
-
-    def strategy
-      context.get(:strategy)
-    end
   end
 end

data/definitions/scenarios/foreman_upgrade.rb

@@ -48,6 +48,7 @@ module Scenarios::Foreman
         Checks::ForemanTasks::Invalid::CheckPendingState, # if foreman-tasks
         Checks::ForemanTasks::Invalid::CheckPlanningState, # if foreman-tasks
         Checks::ForemanTasks::NotRunning, # if foreman-tasks
+        Checks::Pulpcore::NoRunningTasks, # if pulpcore
         Checks::NonRhPackages,
         Checks::PackageManager::Dnf::ValidateDnfConfig,
         Checks::Repositories::CheckNonRhRepository,

data/definitions/scenarios/restore.rb

@@ -28,7 +28,7 @@ module ForemanMaintain::Scenarios
       add_steps_with_context(Procedures::Restore::Confirmation,
         Procedures::Restore::RequiredPackages,
         Procedures::Restore::Configs)
-      add_step_with_context(Procedures::Crond::Stop) if feature(:cron)
+      add_step_with_context(Procedures::Crond::Stop)
       unless backup.incremental?
         add_steps_with_context(Procedures::Restore::InstallerReset)
       end
@@ -48,7 +48,7 @@ module ForemanMaintain::Scenarios
 
       add_step(Procedures::Installer::Run.new(:assumeyes => true))
       add_step_with_context(Procedures::Installer::UpgradeRakeTask)
-      add_step_with_context(Procedures::Crond::Start) if feature(:cron)
+      add_step_with_context(Procedures::Crond::Start)
     end
     # rubocop:enable Metrics/MethodLength,Metrics/AbcSize
 
@@ -93,7 +93,7 @@ module ForemanMaintain::Scenarios
     end
 
     def compose
-      add_step_with_context(Procedures::Crond::Stop) if feature(:cron)
+      add_step_with_context(Procedures::Crond::Stop)
     end
   end
 end

data/definitions/scenarios/satellite_upgrade.rb

@@ -48,6 +48,7 @@ module Scenarios::Satellite
         Checks::ForemanTasks::Invalid::CheckPendingState, # if foreman-tasks
         Checks::ForemanTasks::Invalid::CheckPlanningState, # if foreman-tasks
         Checks::ForemanTasks::NotRunning, # if foreman-tasks
+        Checks::Pulpcore::NoRunningTasks, # if pulpcore
         Checks::NonRhPackages,
         Checks::PackageManager::Dnf::ValidateDnfConfig,
         Checks::Repositories::CheckNonRhRepository,

data/definitions/scenarios/update.rb

@@ -5,7 +5,7 @@ module Scenarios::Update
         tags :update_scenario
 
         confine do
-          feature(:instance).target_version == feature(:instance).current_version.to_s[/^\d+\.\d+/]
+          feature(:instance).target_version == feature(:instance).current_major_version
         end
 
         instance_eval(&block)
@@ -46,6 +46,7 @@ module Scenarios::Update
         Checks::ForemanTasks::Invalid::CheckPendingState, # if foreman-tasks
         Checks::ForemanTasks::Invalid::CheckPlanningState, # if foreman-tasks
         Checks::ForemanTasks::NotRunning, # if foreman-tasks
+        Checks::Pulpcore::NoRunningTasks, # if pulpcore
         Checks::NonRhPackages,
         Checks::PackageManager::Dnf::ValidateDnfConfig,
         Checks::Repositories::CheckNonRhRepository,

data/extras/foreman_protector/dnf/foreman-protector.py

@@ -53,7 +53,7 @@ class ForemanProtector(dnf.Plugin):
         return final_query
 
     def sack(self):
-        if self.cli is not None and self.cli.command._basecmd not in PROTECT_COMMANDS:
+        if self.cli is not None and self.cli.command is not None and self.cli.command._basecmd not in PROTECT_COMMANDS:
             return
         if os.environ.get('LEAPP_IPU_IN_PROGRESS') is not None:
             return

data/lib/foreman_maintain/cli/backup_command.rb

@@ -57,6 +57,7 @@ module ForemanMaintain
           option '--features', 'FEATURES',
             "#{proxy_name} features to include in the backup. " \
                 'Valid features are tftp, dns, dhcp, openscap, and all.', :multivalued => true
+          option '--wait-for-tasks', :flag, 'Wait for running tasks to complete instead of aborting'
         end
         # rubocop:enable  Metrics/MethodLength
 
@@ -89,6 +90,7 @@ module ForemanMaintain
           :tar_volume_size => split_pulp_tar,
           :skip_pulp_content => skip_pulp_content?,
           :incremental_dir => incremental,
+          :wait_for_tasks => wait_for_tasks?,
         }.merge(options))
       end
 
@@ -110,6 +112,13 @@ module ForemanMaintain
       interactive_option
       common_backup_options
 
+      banner <<-BANNER
+      Create a backup with most services still running.
+
+      The only services that are shut down are workers that can influence
+      the consistency of the backup.
+      BANNER
+
       def execute
         perform_backup(:online)
       end
@@ -120,14 +129,18 @@ module ForemanMaintain
       interactive_option
       common_backup_options
 
+      banner <<-BANNER
+      Create a backup with all services shut down.
+      BANNER
+
       def execute
         perform_backup(:offline)
       end
     end
 
     class BackupCommand < Base
-      subcommand 'online', 'Keep services online during backup', OnlineBackupCommand
-      subcommand 'offline', 'Shut down services to preserve consistent backup', OfflineBackupCommand
+      subcommand 'online', 'Create backup with most services still running', OnlineBackupCommand
+      subcommand 'offline', 'Create backup with all services shut down', OfflineBackupCommand
     end
   end
 end

data/lib/foreman_maintain/cli/upgrade_command.rb

@@ -1,85 +1,72 @@
 module ForemanMaintain
   module Cli
     class UpgradeCommand < Base
-      def self.target_version_option
-        option '--target-version', 'TARGET_VERSION', 'Target version of the upgrade',
-          :required => false
-      end
-
       def self.disable_self_upgrade_option
         option '--disable-self-upgrade', :flag, 'Disable automatic self upgrade',
           :default => false
       end
 
-      def current_target_version
-        current_target_version = ForemanMaintain::UpgradeRunner.current_target_version
-        if current_target_version && target_version && target_version != current_target_version
-          raise Error::UsageError,
-            "Can't set target version #{target_version}, "\
-            "#{current_target_version} already in progress"
-        end
-        @target_version = current_target_version if current_target_version
-        return true if current_target_version
-      end
-
-      def validate_target_version!
-        return if current_target_version
-        unless UpgradeRunner.available_targets.include?(target_version)
-          message_start = if target_version
-                            "Can't upgrade to #{target_version}"
-                          else
-                            '--target-version not specified'
-                          end
-          message = <<~MESSAGE
-            #{message_start}
-            Possible target versions are:
-          MESSAGE
-          versions = UpgradeRunner.available_targets.join("\n")
-          raise Error::UsageError, message + versions
-        end
-      end
-
       def upgrade_runner
         return @upgrade_runner if defined? @upgrade_runner
-        validate_target_version!
-        @upgrade_runner = ForemanMaintain::UpgradeRunner.new(target_version, reporter,
+        @upgrade_runner = ForemanMaintain::UpgradeRunner.new(reporter,
           :assumeyes => assumeyes?,
           :whitelist => whitelist || [],
           :force => force?).tap(&:load)
       end
 
-      def print_versions(target_versions)
-        target_versions.sort.each { |version| puts version }
-      end
-
       def allow_self_upgrade?
         !disable_self_upgrade?
       end
 
+      def try_upgrade
+        if upgrade_runner.available?
+          yield
+        else
+          instance = ForemanMaintain.detector.feature(:instance)
+          msg = <<~BANNER
+
+            There are no upgrades available.
+            The current version of #{instance.product_name} is #{instance.current_major_version}.
+            Consider using the update command.
+          BANNER
+
+          puts msg
+          ForemanMaintain::UpgradeRunner::WARNING_EXIT_CODE
+        end
+      end
+
       subcommand 'check', 'Run pre-upgrade checks before upgrading to specified version' do
-        target_version_option
         interactive_option
         disable_self_upgrade_option
 
         def execute
           ForemanMaintain.validate_downstream_packages
           ForemanMaintain.perform_self_upgrade if allow_self_upgrade?
-          upgrade_runner.run_phase(:pre_upgrade_checks)
-          exit upgrade_runner.exit_code
+
+          exit_code = try_upgrade do
+            upgrade_runner.run_phase(:pre_upgrade_checks)
+            upgrade_runner.exit_code
+          end
+
+          exit exit_code
         end
       end
 
       subcommand 'run', 'Run full upgrade to a specified version' do
-        target_version_option
         interactive_option
         disable_self_upgrade_option
 
         def execute
           ForemanMaintain.validate_downstream_packages
           ForemanMaintain.perform_self_upgrade if allow_self_upgrade?
-          upgrade_runner.run
-          upgrade_runner.save
-          exit upgrade_runner.exit_code
+
+          exit_code = try_upgrade do
+            upgrade_runner.run
+            upgrade_runner.save
+            upgrade_runner.exit_code
+          end
+
+          exit exit_code
         end
       end
     end

data/lib/foreman_maintain/config.rb

@@ -52,8 +52,8 @@ module ForemanMaintain
     end
 
     def load_cron_option
-      opt_val = @options.fetch(:manage_crond, false)
-      @manage_crond = boolean?(opt_val) ? opt_val : false
+      opt_val = @options.fetch(:manage_crond, true)
+      @manage_crond = boolean?(opt_val) ? opt_val : true
     end
 
     def load_config

data/lib/foreman_maintain/runner.rb

@@ -4,6 +4,9 @@ module ForemanMaintain
     include Concerns::Logger
     attr_reader :reporter, :exit_code
 
+    WARNING_EXIT_CODE = 78
+    FAILURE_EXIT_CODE = 1
+
     require 'foreman_maintain/runner/execution'
     require 'foreman_maintain/runner/stored_execution'
     def initialize(reporter, scenarios, options = {})
@@ -61,8 +64,8 @@ module ForemanMaintain
         @last_scenario = scenario
         @last_scenario_continuation_confirmed = false
       end
-      @exit_code = 78 if scenario.warning?
-      @exit_code = 1 if scenario.failed?
+      @exit_code = WARNING_EXIT_CODE if scenario.warning?
+      @exit_code = FAILURE_EXIT_CODE if scenario.failed?
     end
 
     def whitelisted_step?(step)

data/lib/foreman_maintain/upgrade_runner.rb

@@ -34,32 +34,31 @@ module ForemanMaintain
 
     attr_reader :version, :tag, :phase
 
-    def initialize(version, reporter, options = {})
+    def initialize(reporter, options = {})
       super(reporter, [], options)
-      @version = version
-      scenarios_present = find_scenarios(:tags => :upgrade_scenario).any?(&matching_version_test)
-      raise "Unknown version #{version}" unless scenarios_present
-
       @scenario_cache = {}
-      self.phase = :pre_upgrade_checks
+      @phase = :pre_upgrade_checks
+      condition = { :tags => [:upgrade_scenario, phase] }
+      matching_scenarios = find_scenarios(condition)
+      @version = matching_scenarios.first&.target_version
+    end
+
+    def available?
+      condition = { :tags => [:upgrade_scenario, :pre_upgrade_checks] }
+      matching_scenarios = find_scenarios(condition)
+      !matching_scenarios.empty?
     end
 
     def scenario(phase)
       return @scenario_cache[phase] if @scenario_cache.key?(phase)
 
       condition = { :tags => [:upgrade_scenario, phase] }
-      matching_scenarios = find_scenarios(condition).select(&matching_version_test)
+      matching_scenarios = find_scenarios(condition)
       raise "Too many scenarios match #{condition.inspect}" if matching_scenarios.size > 1
 
       @scenario_cache[phase] = matching_scenarios.first
     end
 
-    def matching_version_test
-      proc do |scenario|
-        scenario.respond_to?(:target_version) && scenario.target_version == @version
-      end
-    end
-
     def run
       self.class.current_target_version = @version
       PHASES.each do |phase|

data/lib/foreman_maintain/version.rb

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

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: foreman_maintain
 version: !ruby/object:Gem::Version
-  version: 1.6.14
+  version: 1.7.1
 platform: ruby
 authors:
 - Ivan Nečas
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2024-08-05 00:00:00.000000000 Z
+date: 2024-08-21 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: clamp
@@ -187,6 +187,7 @@ files:
 - definitions/checks/non_rh_packages.rb
 - definitions/checks/package_manager/dnf/validate_dnf_config.rb
 - definitions/checks/pulpcore/db_up.rb
+- definitions/checks/pulpcore/no_running_tasks.rb
 - definitions/checks/puppet/verify_no_empty_cacert_requests.rb
 - definitions/checks/repositories/check_non_rh_repository.rb
 - definitions/checks/repositories/check_upstream_repository.rb
@@ -238,7 +239,6 @@ files:
 - definitions/procedures/backup/online/candlepin_db.rb
 - definitions/procedures/backup/online/foreman_db.rb
 - definitions/procedures/backup/online/pulpcore_db.rb
-- definitions/procedures/backup/online/safety_confirmation.rb
 - definitions/procedures/backup/prepare_directory.rb
 - definitions/procedures/backup/pulp.rb
 - definitions/procedures/crond/start.rb
@@ -273,6 +273,7 @@ files:
 - definitions/procedures/packages/update.rb
 - definitions/procedures/packages/update_all_confirmation.rb
 - definitions/procedures/pulpcore/container_handle_image_metadata.rb
+- definitions/procedures/pulpcore/wait_for_tasks.rb
 - definitions/procedures/puppet/delete_empty_ca_cert_request_files.rb
 - definitions/procedures/puppet/remove_puppet.rb
 - definitions/procedures/puppet/remove_puppet_data.rb

data/definitions/procedures/backup/online/safety_confirmation.rb

@@ -1,27 +0,0 @@
-module Procedures::Backup
-  module Online
-    class SafetyConfirmation < ForemanMaintain::Procedure
-      metadata do
-        description 'Data consistency warning'
-        tags :backup
-      end
-
-      def run
-        answer = ask_decision(warning_message, actions_msg: 'y(yes), q(quit)')
-        abort! unless answer == :yes
-      end
-
-      def warning_message
-        "*** WARNING: The online backup is intended for making a copy of the data\n" \
-          '*** for debugging purposes only.' \
-          " The backup routine can not ensure 100% consistency while the\n" \
-          "*** backup is taking place as there is a chance there may be data mismatch between\n" \
-          '*** the databases while the services are live.' \
-          " If you wish to utilize the online backup\n" \
-          '*** for production use you need to ensure that there are' \
-          " no modifications occurring during\n" \
-          "*** your backup run.\n\nDo you want to proceed?"
-      end
-    end
-  end
-end