foreman_maintain 1.5.0 → 1.6.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 100d751c774b8d059da095d52e16b0f550d07cfc452dde7416c02268dceceea0
-  data.tar.gz: 4d321b112aed2dd01a6f4175a66ce0f70a58b40a66da9b476bda3eb12a4697ca
+  metadata.gz: 86d36d447cf87e6f991443352eb5fb9cfdc2b43b634b382c7564f5b86f7e70d1
+  data.tar.gz: 3811b68a80511a95cb5a67b9c8176f623f840ab500e1986b31cd8eac488378ee
 SHA512:
-  metadata.gz: 3b1760b02ab02ad1918de24f7aef1f761cf24aefb76ab0191d360cd14b430255926fff5971b349f7f18cd0736664add545af2a3a0a04b73e3e6e71a7b75952ae
-  data.tar.gz: 806f8f9c132c662b9e5a812520589a59c4986783b1962389705d5743f901bfd157c5fb9bf4c16455c80678d3033648d6f0ee36f41045bbbae59e097d62381624
+  metadata.gz: df3b536d2f6b89e478fb0355f4f5fbf7049f4d9195dd11c15c46133d341e1d5bd4fd14aabebd35f2b5dd92d341159e5fd8a15a7ddf7ab1f7f9241b3498fe1fe1
+  data.tar.gz: 0c6f8a11f9955900d30c771866ffbeb49ed6bb6c5432fe3575ecef0069d7b76db0099b6a2e37b01adc600013996a46e12d1ffd72986f882cd09b8d9b4cbc5bae

data/README.md

@@ -41,7 +41,6 @@ Subcommands:
     backup                        Backup server
       online                        Keep services online during backup
       offline                       Shut down services to preserve consistent backup
-      snapshot                      Use snapshots of the databases to create backup
 
     restore                       Restore a backup
 
@@ -114,8 +113,6 @@ state of the system.
 
 #### Self-upgrade for rubygem-foreman_maintain package
 
-**Note:** This feature is available from `rubygem-foreman_maintain` version 0.6.4 and newer.
-
 When a user runs any `foreman-maintain upgrade` sub commands (e.g. `foreman-maintain upgrade check` or `foreman-maintain upgrade run`) then,
 
   * If update available for `rubygem-foreman_maintain` package, the sub command tries to update this package. After successful package update, it returns the exit code 75 and requests user to re-run with the updated source code.
@@ -156,12 +153,6 @@ export EXTERNAL_SAT_ORG='Sat6-CI'
 export EXTERNAL_SAT_ACTIVATION_KEY='Satellite QA RHEL7'
 ```
 
-To use beta repositories during upgrade, set the following environment variable
-
-```
-export FOREMAN_MAINTAIN_USE_BETA='1'
-```
-
 ## Implementation
 
 The `foreman_maintain` maps the CLI commands into definitions. This allows to keep the set
@@ -427,17 +418,6 @@ There are multiple kind of tests `foreman_maintain`:
 
 Execute `rake` to run the tests.
 
-## Planned commands:
-
-```
-foreman-maintain health [check|fix]
-foreman-maintain upgrade [check|run|abort] [foreman_1_14, satellite_6_1, satellite_6_2]
-foreman-maintain monitor [display|upload]
-foreman-maintain debug [save|upload|tail]
-foreman-maintain console
-foreman-maintain config
-```
-
 ## Bash completion
 
 The completion offers suggestion of possible command-line subcommands and their options

data/definitions/checks/disk/available_space_candlepin.rb

@@ -6,7 +6,7 @@ module Checks
         description 'Check to make sure /var/lib/candlepin has enough space'
         tags :pre_upgrade
         confine do
-          feature(:candlepin) && check_min_version('candlepin', '3.1')
+          feature(:candlepin)
         end
       end
 

data/definitions/checks/disk/available_space_postgresql13.rb

@@ -0,0 +1,42 @@
+module Checks
+  module Disk
+    class AvailableSpacePostgresql13 < ForemanMaintain::Check
+      metadata do
+        label :available_space_for_postgresql13
+        description 'Check to make sure PostgreSQL 13 work directory has enough space for upgrade'
+        confine do
+          feature(:instance).postgresql_local?
+        end
+      end
+
+      def run
+        assert(psql_13_available_space >= psql_12_consumed_space, warning_message)
+      end
+
+      def pgsql_dir(version)
+        case version
+        when 12
+          '/var/lib/pgsql/data'
+        when 13
+          '/var/lib/pgsql'
+        end
+      end
+
+      def psql_12_consumed_space
+        io_obj = ForemanMaintain::Utils::Disk::IODevice.new(pgsql_dir(12))
+        io_obj.space_used
+      end
+
+      def psql_13_available_space
+        io_obj = ForemanMaintain::Utils::Disk::IODevice.new(pgsql_dir(13))
+        io_obj.available_space
+      end
+
+      def warning_message
+        "PostgreSQL will be upgraded from 12 to 13. \n" \
+        "During the upgrade a backup is created in /var/lib/pgsql/data-old and requires " \
+        "at least #{psql_12_consumed_space} MiB free space."
+      end
+    end
+  end
+end

data/definitions/checks/foreman/check_corrupted_roles.rb

@@ -6,9 +6,6 @@ module Checks
         for_feature :foreman_database
         description 'Check for roles that have filters with multiple resources attached'
         tags :pre_upgrade
-        confine do
-          check_min_version('foreman', '1.15')
-        end
       end
 
       def run

data/definitions/checks/foreman/validate_external_db_version.rb

@@ -6,8 +6,7 @@ module Checks
         tags :pre_upgrade
         label :validate_external_db_version
         confine do
-          feature(:foreman_database) && !feature(:foreman_database).local? &&
-            !check_min_version('foreman', '2.0')
+          feature(:foreman_database) && !feature(:foreman_database).local?
         end
       end
 

data/definitions/features/foreman_proxy.rb

@@ -28,11 +28,7 @@ class Features::ForemanProxy < ForemanMaintain::Feature
   end
 
   def services
-    services = [system_service('foreman-proxy', 40)]
-    if check_max_version('foreman-proxy', '2.4')
-      services << system_service('smart_proxy_dynflow_core', 20)
-    end
-    services
+    [system_service('foreman-proxy', 40)]
   end
 
   def features
@@ -94,11 +90,7 @@ class Features::ForemanProxy < ForemanMaintain::Feature
   end
 
   def certs_param_name
-    if check_min_version('foreman', '1.21')
-      return { :param_section => 'certs', :param_key => 'tar_file' }
-    end
-
-    { :param_section => 'foreman_proxy_content', :param_key => 'certs_tar' }
+    { :param_section => 'certs', :param_key => 'tar_file' }
   end
 
   def certs_tar

data/definitions/features/foreman_tasks.rb

@@ -91,13 +91,9 @@ class Features::ForemanTasks < ForemanMaintain::Feature
       DELETE FROM foreman_tasks_tasks WHERE #{tasks_condition};
       -- Delete locks and links which may now be orphaned
       DELETE FROM foreman_tasks_locks as ftl where ftl.task_id NOT IN (SELECT id FROM foreman_tasks_tasks);
+      DELETE FROM foreman_tasks_links as ftl where ftl.task_id NOT IN (SELECT id FROM foreman_tasks_tasks);
     SQL
 
-    if check_min_version(foreman_plugin_name('foreman-tasks'), '4.0.0')
-      sql += 'DELETE FROM foreman_tasks_links as ftl ' \
-             'where ftl.task_id NOT IN (SELECT id FROM foreman_tasks_tasks);'
-    end
-
     feature(:foreman_database).psql("BEGIN; #{sql}; COMMIT;")
 
     count(state)
@@ -134,7 +130,7 @@ class Features::ForemanTasks < ForemanMaintain::Feature
   end
 
   def service_name
-    check_min_version('foreman', '1.17') ? 'dynflowd' : 'foreman-tasks'
+    'dynflowd'
   end
 
   private

data/definitions/features/installer.rb

@@ -60,10 +60,6 @@ class Features::Installer < ForemanMaintain::Feature
     [cmd_status, out]
   end
 
-  def upgrade(exec_options = {})
-    run('', exec_options)
-  end
-
   def initial_admin_username
     feature(:installer).answers['foreman']['initial_admin_username'] ||
       feature(:installer).answers['foreman']['admin_username']

data/definitions/features/pulpcore_database.rb

@@ -9,7 +9,7 @@ class Features::PulpcoreDatabase < ForemanMaintain::Feature
     label :pulpcore_database
 
     confine do
-      file_nonzero?(PULPCORE_DB_CONFIG) && check_min_version('katello-common', '3.18')
+      file_nonzero?(PULPCORE_DB_CONFIG)
     end
   end
 

data/definitions/procedures/backup/offline/candlepin_db.rb

@@ -9,7 +9,6 @@ module Procedures::Backup
         preparation_steps { Checks::Candlepin::DBUp.new unless feature(:candlepin_database).local? }
         param :backup_dir, 'Directory where to backup to', :required => true
         param :tar_volume_size, 'Size of tar volume (indicates splitting)'
-        param :mount_dir, 'Snapshot mount directory'
       end
 
       def run
@@ -47,11 +46,7 @@ module Procedures::Backup
       end
 
       def pg_data_dir
-        return feature(:candlepin_database).data_dir if @mount_dir.nil?
-        mount_point = File.join(@mount_dir, 'pgsql')
-        dir = feature(:candlepin_database).find_base_directory(mount_point)
-        fail!("Snapshot of Candlepin DB was not found mounted in #{mount_point}") if dir.nil?
-        dir
+        feature(:candlepin_database).data_dir
       end
     end
   end

data/definitions/procedures/backup/offline/foreman_db.rb

@@ -9,7 +9,6 @@ module Procedures::Backup
         preparation_steps { Checks::Foreman::DBUp.new unless feature(:foreman_database).local? }
         param :backup_dir, 'Directory where to backup to', :required => true
         param :tar_volume_size, 'Size of tar volume (indicates splitting)'
-        param :mount_dir, 'Snapshot mount directory'
       end
 
       def run
@@ -63,17 +62,11 @@ module Procedures::Backup
         # There could be situations where Foreman db is either of these versions
         # To be sure we backup the system correctly without missing anything
         # we backup all of the Postgresql dirs
-        # Yet to implement the snapshot backup!
         feature(:foreman_database).data_dir
       end
 
       def pg_data_dir_el
-        return feature(:foreman_database).data_dir if @mount_dir.nil?
-
-        mount_point = File.join(@mount_dir, 'pgsql')
-        dir = feature(:foreman_database).find_base_directory(mount_point)
-        fail!("Snapshot of Foreman DB was not found mounted in #{mount_point}") if dir.nil?
-        dir
+        feature(:foreman_database).data_dir
       end
     end
   end

data/definitions/procedures/backup/offline/pulpcore_db.rb

@@ -9,7 +9,6 @@ module Procedures::Backup
         preparation_steps { Checks::Pulpcore::DBUp.new unless feature(:pulpcore_database).local? }
         param :backup_dir, 'Directory where to backup to', :required => true
         param :tar_volume_size, 'Size of tar volume (indicates splitting)'
-        param :mount_dir, 'Snapshot mount directory'
       end
 
       def run
@@ -47,11 +46,7 @@ module Procedures::Backup
       end
 
       def pg_data_dir
-        return feature(:pulpcore_database).data_dir if @mount_dir.nil?
-        mount_point = File.join(@mount_dir, 'pgsql')
-        dir = feature(:pulpcore_database).find_base_directory(mount_point)
-        fail!("Snapshot of Pulpcore DB was not found mounted in #{mount_point}") if dir.nil?
-        dir
+        feature(:pulpcore_database).data_dir
       end
     end
   end

data/definitions/procedures/backup/pulp.rb

@@ -7,7 +7,6 @@ module Procedures::Backup
       param :tar_volume_size, 'Size of tar volume (indicates splitting)'
       param :ensure_unchanged, 'Ensure the data did not change during backup'
       param :skip, 'Skip Pulp content during backup'
-      param :mount_dir, 'Snapshot mount directory'
 
       confine do
         feature(:pulpcore_database)
@@ -46,15 +45,7 @@ module Procedures::Backup
     end
 
     def pulp_dir
-      return any_pulp_feature.pulp_data_dir if @mount_dir.nil?
-
-      mount_point = File.join(@mount_dir, 'pulp')
-      dir = any_pulp_feature.find_marked_directory(mount_point)
-      unless dir
-        raise ForemanMaintain::Error::Fail,
-          "Pulp base directory not found in the mount point (#{mount_point})"
-      end
-      dir
+      any_pulp_feature.pulp_data_dir
     end
 
     def ensure_dir_unchanged

data/definitions/procedures/foreman/fix_corrupted_roles.rb

@@ -4,9 +4,6 @@ module Procedures::Foreman
       for_feature :foreman_database
       desc = 'Create additional filters so that each filter has only permissions of one resource'
       description desc
-      confine do
-        check_min_version('foreman', '1.15')
-      end
     end
 
     def run

data/definitions/procedures/packages/update.rb

@@ -7,11 +7,12 @@ module Procedures::Packages
       param :warn_on_errors, 'Do not interrupt scenario on failure',
         :flag => true, :default => false
       param :dnf_options, 'Extra dnf options if any', :array => true, :default => []
+      param :clean_cache, 'If true will cause a DNF cache clean', :flag => true, :default => true
     end
 
     def run
       assumeyes_val = @assumeyes.nil? ? assumeyes? : @assumeyes
-      package_manager.clean_cache(:assumeyes => assumeyes_val)
+      package_manager.clean_cache(:assumeyes => assumeyes_val) if @clean_cache
       opts = { :assumeyes => assumeyes_val, :dnf_options => @dnf_options }
       packages_action(:update, @packages, opts)
     rescue ForemanMaintain::Error::ExecutionError => e
@@ -27,11 +28,15 @@ module Procedures::Packages
     end
 
     def description
-      if @dnf_options.include?('--downloadonly')
+      if download_only?
         "Download package(s) #{@packages.join(', ')}"
       else
         "Update package(s) #{@packages.join(', ')}"
       end
     end
+
+    def download_only?
+      @dnf_options.include?('--downloadonly')
+    end
   end
 end

data/definitions/procedures/puppet/remove_puppet.rb

@@ -3,8 +3,7 @@ module Procedures::Puppet
     metadata do
       description 'Remove Puppet feature'
       confine do
-        feature(:puppet_server) &&
-          (check_min_version('foreman', '3.6') || check_min_version('foreman-proxy', '3.6'))
+        feature(:puppet_server)
       end
       advanced_run false
     end

data/definitions/procedures/restore/installer_reset.rb

@@ -12,28 +12,12 @@ module Procedures::Restore
 
     def installer_cmd
       installer = "yes | #{feature(:installer).installer_command} "
-      installer << reset_option
+      installer << '-v --reset-data '
       if feature(:instance).foreman_proxy_with_content?
         installer << '--foreman-proxy-register-in-foreman false '
       end
 
-      # We always disable system checks to avoid unnecessary errors. The installer should have
-      # already ran since this is to be run on an existing system, which means installer checks
-      # has already been skipped
-      if feature(:foreman_proxy)&.with_content? &&
-         check_max_version('foreman-installer', '3.4')
-        installer << '--disable-system-checks '
-      end
       installer
     end
-
-    def reset_option
-      if check_min_version('foreman', '2.2') || \
-         check_min_version('foreman-proxy', '2.2')
-        return '-v --reset-data '
-      end
-
-      '-v --reset '
-    end
   end
 end

data/definitions/scenarios/backup.rb

@@ -5,27 +5,22 @@ module ForemanMaintain::Scenarios
       manual_detection
       tags :backup
       run_strategy :fail_fast
-      param :strategy, 'Backup strategy. One of [:online, :offline, :snapshot]',
+      param :strategy, 'Backup strategy. One of [:online, :offline]',
         :required => true
       param :backup_dir, 'Directory where to backup to', :required => true
-      param :mount_dir, 'Snapshot mount directory'
       param :include_db_dumps, 'Include dumps of local dbs as part of offline'
       param :preserve_dir, 'Directory where to backup to'
       param :incremental_dir, 'Changes since specified backup only'
       param :proxy_features, 'List of proxy features to backup (default: all)', :array => true
-      param :snapshot_mount_dir, 'Snapshot mount directory'
-      param :snapshot_block_size, 'Snapshot block size'
       param :skip_pulp_content, 'Skip Pulp content during backup'
       param :tar_volume_size, 'Size of tar volume (indicates splitting)'
     end
 
     def compose
       check_valid_strategy
-      snapshot_deprecation_warning
       safety_confirmation
       accessibility_confirmation
       prepare_directory
-      logical_volume_confirmation
       add_step_with_context(Procedures::Backup::Metadata, :online_backup => online_backup?)
 
       case strategy
@@ -33,20 +28,10 @@ module ForemanMaintain::Scenarios
         add_online_backup_steps
       when :offline
         add_offline_backup_steps
-      when :snapshot
-        deb_snapshot_msg
-        add_snapshot_backup_steps
       end
       add_step_with_context(Procedures::Backup::CompressData)
     end
 
-    def deb_snapshot_msg
-      if debian_or_ubuntu?
-        puts 'The snapshot backup is not yet available for Debian based OSes!'
-        exit 0
-      end
-    end
-
     # rubocop:disable  Metrics/MethodLength
     def set_context_mapping
       context.map(:backup_dir,
@@ -60,11 +45,7 @@ module ForemanMaintain::Scenarios
         Procedures::Backup::Online::PulpcoreDB => :backup_dir,
         Procedures::Backup::Offline::CandlepinDB => :backup_dir,
         Procedures::Backup::Offline::ForemanDB => :backup_dir,
-        Procedures::Backup::Offline::PulpcoreDB => :backup_dir,
-        Procedures::Backup::Snapshot::LogicalVolumeConfirmation => :backup_dir,
-        Procedures::Backup::Snapshot::MountCandlepinDB => :backup_dir,
-        Procedures::Backup::Snapshot::MountForemanDB => :backup_dir,
-        Procedures::Backup::Snapshot::MountPulpcoreDB => :backup_dir)
+        Procedures::Backup::Offline::PulpcoreDB => :backup_dir)
       context.map(:preserve_dir,
         Procedures::Backup::PrepareDirectory => :preserve_dir)
       context.map(:incremental_dir,
@@ -72,26 +53,8 @@ module ForemanMaintain::Scenarios
         Procedures::Backup::Metadata => :incremental_dir)
       context.map(:proxy_features,
         Procedures::Backup::ConfigFiles => :proxy_features)
-      context.map(:snapshot_mount_dir,
-        Procedures::Backup::Snapshot::PrepareMount => :mount_dir,
-        Procedures::Backup::Snapshot::MountPulp => :mount_dir,
-        Procedures::Backup::Snapshot::CleanMount => :mount_dir,
-        Procedures::Backup::Snapshot::MountCandlepinDB => :mount_dir,
-        Procedures::Backup::Snapshot::MountForemanDB => :mount_dir,
-        Procedures::Backup::Snapshot::MountPulpcoreDB => :mount_dir,
-        Procedures::Backup::Pulp => :mount_dir,
-        Procedures::Backup::Offline::CandlepinDB => :mount_dir,
-        Procedures::Backup::Offline::ForemanDB => :mount_dir,
-        Procedures::Backup::Offline::PulpcoreDB => :mount_dir)
-      context.map(:snapshot_block_size,
-        Procedures::Backup::Snapshot::MountPulp => :block_size,
-        Procedures::Backup::Snapshot::MountForemanDB => :block_size,
-        Procedures::Backup::Snapshot::MountCandlepinDB => :block_size,
-        Procedures::Backup::Snapshot::MountPulpcoreDB => :block_size)
       context.map(:skip_pulp_content,
-        Procedures::Backup::Pulp => :skip,
-        Procedures::Backup::Snapshot::LogicalVolumeConfirmation => :skip_pulp,
-        Procedures::Backup::Snapshot::MountPulp => :skip)
+        Procedures::Backup::Pulp => :skip)
       context.map(:tar_volume_size,
         Procedures::Backup::Pulp => :tar_volume_size)
       context.map(:include_db_dumps,
@@ -105,20 +68,8 @@ module ForemanMaintain::Scenarios
       add_step_with_context(Procedures::Backup::PrepareDirectory)
     end
 
-    def logical_volume_confirmation
-      if strategy == :snapshot
-        add_step_with_context(Procedures::Backup::Snapshot::LogicalVolumeConfirmation)
-      end
-    end
-
-    def snapshot_deprecation_warning
-      if strategy == :snapshot
-        add_step_with_context(Procedures::Backup::Snapshot::SnapshotDeprecationMessage)
-      end
-    end
-
     def accessibility_confirmation
-      if [:offline, :snapshot].include?(strategy)
+      if strategy == :offline
         add_step_with_context(Procedures::Backup::AccessibilityConfirmation)
       end
     end
@@ -130,7 +81,7 @@ module ForemanMaintain::Scenarios
     end
 
     def check_valid_strategy
-      unless [:online, :offline, :snapshot].include? strategy
+      unless [:online, :offline].include? strategy
         raise ArgumentError, "Unsupported strategy '#{strategy}'"
       end
     end
@@ -163,36 +114,6 @@ module ForemanMaintain::Scenarios
       end
     end
 
-    # rubocop:disable  Metrics/MethodLength
-    def add_snapshot_backup_steps
-      include_dumps if include_db_dumps?
-      add_step_with_context(Procedures::ForemanProxy::Features, :load_only => true)
-      add_steps_with_context(
-        Procedures::Backup::Snapshot::PrepareMount,
-        find_procedures(:maintenance_mode_on),
-        Procedures::Service::Stop,
-        Procedures::Backup::ConfigFiles,
-        Procedures::Backup::Snapshot::MountPulp,
-        Procedures::Backup::Snapshot::MountCandlepinDB,
-        Procedures::Backup::Snapshot::MountForemanDB,
-        Procedures::Backup::Snapshot::MountPulpcoreDB,
-        Procedures::Service::Start,
-        find_procedures(:maintenance_mode_off),
-        Procedures::Backup::Pulp
-      )
-      if feature(:instance).database_local?(:candlepin_database)
-        add_step_with_context(Procedures::Backup::Offline::CandlepinDB)
-      end
-      if feature(:instance).database_local?(:foreman_database)
-        add_step_with_context(Procedures::Backup::Offline::ForemanDB)
-      end
-      if feature(:instance).database_local?(:pulpcore_database)
-        add_step_with_context(Procedures::Backup::Offline::PulpcoreDB)
-      end
-      add_step_with_context(Procedures::Backup::Snapshot::CleanMount)
-    end
-    # rubocop:enable  Metrics/MethodLength
-
     def add_online_backup_steps
       add_step_with_context(Procedures::Backup::ConfigFiles, :ignore_changed_files => true,
         :online_backup => true)
@@ -224,20 +145,16 @@ module ForemanMaintain::Scenarios
       run_strategy :fail_slow
       tags :backup
       param :backup_dir, 'Directory where to backup to', :required => true
-      param :mount_dir, 'Snapshot mount directory'
       param :preserve_dir, 'Directory where to backup to'
     end
 
     def compose
       add_step_with_context(Procedures::Service::Start) if strategy != :online
       add_steps_with_context(find_procedures(:maintenance_mode_off)) if strategy != :online
-      add_step_with_context(Procedures::Backup::Snapshot::CleanMount) if strategy == :snapshot
       add_step_with_context(Procedures::Backup::Clean)
     end
 
     def set_context_mapping
-      context.map(:snapshot_mount_dir,
-        Procedures::Backup::Snapshot::CleanMount => :mount_dir)
       context.map(:backup_dir,
         Procedures::Backup::Clean => :backup_dir)
       context.map(:preserve_dir,

data/definitions/scenarios/packages.rb

@@ -79,7 +79,7 @@ module ForemanMaintain::Scenarios
           add_step_with_context(Procedures::Packages::UnlockVersions)
           add_step_with_context(Procedures::Packages::Install,
             :force => true, :warn_on_errors => true)
-          add_step_with_context(Procedures::Installer::Upgrade)
+          add_step_with_context(Procedures::Installer::Run)
           add_step(Procedures::Packages::LockingStatus)
         end
       end
@@ -112,7 +112,7 @@ module ForemanMaintain::Scenarios
           add_step_with_context(Procedures::Packages::UnlockVersions)
           add_step_with_context(Procedures::Packages::Update,
             :force => true, :warn_on_errors => true)
-          add_step_with_context(Procedures::Installer::Upgrade)
+          add_step_with_context(Procedures::Installer::Run)
           add_step(Procedures::Packages::LockingStatus)
         end
       end

data/definitions/scenarios/puppet.rb

@@ -10,12 +10,10 @@ module ForemanMaintain::Scenarios
       end
 
       def compose
-        if check_min_version('foreman', '3.0') || check_min_version('foreman-proxy', '3.0')
-          add_step(Checks::CheckPuppetCapsules) if server?
-          add_step(Procedures::Puppet::RemovePuppet)
-          add_step(Procedures::Puppet::RemovePuppetData) if context.get(:remove_data)
-          add_step(Procedures::Service::Restart)
-        end
+        add_step(Checks::CheckPuppetCapsules) if server?
+        add_step(Procedures::Puppet::RemovePuppet)
+        add_step(Procedures::Puppet::RemovePuppetData) if context.get(:remove_data)
+        add_step(Procedures::Service::Restart)
       end
     end
   end

data/definitions/scenarios/restore.rb

@@ -58,7 +58,7 @@ module ForemanMaintain::Scenarios
 
       add_steps_with_context(Procedures::Service::Start,
         Procedures::Service::DaemonReload)
-      add_step(Procedures::Installer::Upgrade.new(:assumeyes => true))
+      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)
     end

data/definitions/scenarios/upgrade_to_capsule_6_16.rb

@@ -27,6 +27,7 @@ module Scenarios::Capsule_6_16
     def compose
       add_steps(find_checks(:default))
       add_steps(find_checks(:pre_upgrade))
+      add_step(Checks::Disk::AvailableSpacePostgresql13)
       add_step(Checks::Repositories::Validate.new(:version => '6.16'))
     end
   end
@@ -38,6 +39,16 @@ module Scenarios::Capsule_6_16
     end
 
     def compose
+      add_step(Procedures::Repositories::Setup.new(:version => '6.16'))
+      if el8?
+        modules_to_enable = ["satellite-capsule:#{el_short_name}"]
+        add_step(Procedures::Packages::EnableModules.new(:module_names => modules_to_enable))
+      end
+      add_step(Procedures::Packages::Update.new(
+        :assumeyes => true,
+        :dnf_options => ['--downloadonly']
+      ))
+
       add_steps(find_procedures(:pre_migrations))
     end
   end
@@ -49,18 +60,13 @@ module Scenarios::Capsule_6_16
     end
 
     def set_context_mapping
-      context.map(:assumeyes, Procedures::Installer::Upgrade => :assumeyes)
+      context.map(:assumeyes, Procedures::Installer::Run => :assumeyes)
     end
 
     def compose
-      add_step(Procedures::Repositories::Setup.new(:version => '6.16'))
-      modules_to_enable = ["satellite-capsule:#{el_short_name}"]
-      add_step(Procedures::Packages::EnableModules.new(:module_names => modules_to_enable))
-      add_step(Procedures::Packages::Update.new(:assumeyes => true,
-        :dnf_options => ['--downloadonly']))
       add_step(Procedures::Service::Stop.new)
-      add_step(Procedures::Packages::Update.new(:assumeyes => true))
-      add_step_with_context(Procedures::Installer::Upgrade)
+      add_step(Procedures::Packages::Update.new(:assumeyes => true, :clean_cache => false))
+      add_step_with_context(Procedures::Installer::Run)
     end
   end