foreman_maintain 1.3.0 → 1.3.2

data/definitions/scenarios/backup.rb

@@ -6,7 +6,7 @@ module ForemanMaintain::Scenarios
       tags :backup
       run_strategy :fail_fast
       param :strategy, 'Backup strategy. One of [:online, :offline, :snapshot]',
-            :required => true
+        :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'
@@ -19,7 +19,6 @@ module ForemanMaintain::Scenarios
       param :tar_volume_size, 'Size of tar volume (indicates splitting)'
     end
 
-    # rubocop:disable Metrics/MethodLength
     def compose
       check_valid_startegy
       safety_confirmation
@@ -39,7 +38,6 @@ module ForemanMaintain::Scenarios
       end
       add_step_with_context(Procedures::Backup::CompressData)
     end
-    # rubocop:enable Metrics/MethodLength
 
     def deb_snapshot_msg
       if debian_or_ubuntu?
@@ -51,70 +49,63 @@ module ForemanMaintain::Scenarios
     # rubocop:disable  Metrics/MethodLength
     def set_context_mapping
       context.map(:backup_dir,
-                  Checks::Backup::DirectoryReady => :backup_dir,
-                  Procedures::Backup::PrepareDirectory => :backup_dir,
-                  Procedures::Backup::Metadata => :backup_dir,
-                  Procedures::Backup::ConfigFiles => :backup_dir,
-                  Procedures::Backup::CompressData => :backup_dir,
-                  Procedures::Backup::Pulp => :backup_dir,
-                  Procedures::Backup::Online::Mongo => :backup_dir,
-                  Procedures::Backup::Online::CandlepinDB => :backup_dir,
-                  Procedures::Backup::Online::ForemanDB => :backup_dir,
-                  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::Offline::Mongo => :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::Snapshot::MountMongo => :backup_dir)
+        Checks::Backup::DirectoryReady => :backup_dir,
+        Procedures::Backup::PrepareDirectory => :backup_dir,
+        Procedures::Backup::Metadata => :backup_dir,
+        Procedures::Backup::ConfigFiles => :backup_dir,
+        Procedures::Backup::CompressData => :backup_dir,
+        Procedures::Backup::Pulp => :backup_dir,
+        Procedures::Backup::Online::CandlepinDB => :backup_dir,
+        Procedures::Backup::Online::ForemanDB => :backup_dir,
+        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)
       context.map(:preserve_dir,
-                  Checks::Backup::DirectoryReady => :preserve_dir,
-                  Procedures::Backup::PrepareDirectory => :preserve_dir)
+        Checks::Backup::DirectoryReady => :preserve_dir,
+        Procedures::Backup::PrepareDirectory => :preserve_dir)
       context.map(:incremental_dir,
-                  Procedures::Backup::PrepareDirectory => :incremental_dir,
-                  Procedures::Backup::Metadata => :incremental_dir)
+        Procedures::Backup::PrepareDirectory => :incremental_dir,
+        Procedures::Backup::Metadata => :incremental_dir)
       context.map(:proxy_features,
-                  Procedures::Backup::ConfigFiles => :proxy_features)
+        Procedures::Backup::ConfigFiles => :proxy_features)
       context.map(:snapshot_mount_dir,
-                  Procedures::Backup::Snapshot::PrepareMount => :mount_dir,
-                  Procedures::Backup::Snapshot::MountMongo => :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::Offline::Mongo => :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)
+        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::MountMongo => :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)
+        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,
+        Procedures::Backup::Snapshot::LogicalVolumeConfirmation => :skip_pulp,
+        Procedures::Backup::Snapshot::MountPulp => :skip)
       context.map(:tar_volume_size,
-                  Procedures::Backup::Pulp => :tar_volume_size)
+        Procedures::Backup::Pulp => :tar_volume_size)
       context.map(:include_db_dumps,
-                  Procedures::Backup::Online::SafetyConfirmation => :include_db_dumps)
+        Procedures::Backup::Online::SafetyConfirmation => :include_db_dumps)
     end
     # rubocop:enable  Metrics/MethodLength
 
     private
 
     def prepare_directory
-      add_steps_with_context(
-        Procedures::Backup::PrepareDirectory,
-        Checks::Backup::DirectoryReady
-      )
+      add_step_with_context(Procedures::Backup::PrepareDirectory)
+      add_step_with_context(Checks::Backup::DirectoryReady,
+        :postgres_access => online_backup? || include_db_dumps?)
     end
 
     def logical_volume_confirmation
@@ -149,7 +140,6 @@ module ForemanMaintain::Scenarios
         Procedures::Service::Stop,
         Procedures::Backup::ConfigFiles,
         Procedures::Backup::Pulp,
-        Procedures::Backup::Offline::Mongo,
         Procedures::Backup::Offline::CandlepinDB,
         Procedures::Backup::Offline::ForemanDB,
         Procedures::Backup::Offline::PulpcoreDB,
@@ -168,9 +158,6 @@ module ForemanMaintain::Scenarios
       if feature(:instance).database_local?(:pulpcore_database)
         add_step_with_context(Procedures::Backup::Online::PulpcoreDB)
       end
-      if feature(:instance).database_local?(:mongo)
-        add_step_with_context(Procedures::Backup::Online::Mongo)
-      end
     end
 
     # rubocop:disable  Metrics/MethodLength
@@ -182,7 +169,6 @@ module ForemanMaintain::Scenarios
         find_procedures(:maintenance_mode_on),
         Procedures::Service::Stop,
         Procedures::Backup::ConfigFiles,
-        Procedures::Backup::Snapshot::MountMongo,
         Procedures::Backup::Snapshot::MountPulp,
         Procedures::Backup::Snapshot::MountCandlepinDB,
         Procedures::Backup::Snapshot::MountForemanDB,
@@ -200,9 +186,6 @@ module ForemanMaintain::Scenarios
       if feature(:instance).database_local?(:pulpcore_database)
         add_step_with_context(Procedures::Backup::Offline::PulpcoreDB)
       end
-      if feature(:instance).database_local?(:mongo)
-        add_step_with_context(Procedures::Backup::Offline::Mongo)
-      end
       add_step_with_context(Procedures::Backup::Snapshot::CleanMount)
     end
     # rubocop:enable  Metrics/MethodLength
@@ -212,7 +195,6 @@ module ForemanMaintain::Scenarios
                                                              :online_backup => true)
       add_step_with_context(Procedures::Backup::Pulp, :ensure_unchanged => true)
       add_steps_with_context(
-        Procedures::Backup::Online::Mongo,
         Procedures::Backup::Online::CandlepinDB,
         Procedures::Backup::Online::ForemanDB,
         Procedures::Backup::Online::PulpcoreDB
@@ -253,11 +235,11 @@ module ForemanMaintain::Scenarios
 
     def set_context_mapping
       context.map(:snapshot_mount_dir,
-                  Procedures::Backup::Snapshot::CleanMount => :mount_dir)
+        Procedures::Backup::Snapshot::CleanMount => :mount_dir)
       context.map(:backup_dir,
-                  Procedures::Backup::Clean => :backup_dir)
+        Procedures::Backup::Clean => :backup_dir)
       context.map(:preserve_dir,
-                  Procedures::Backup::Clean => :preserve_dir)
+        Procedures::Backup::Clean => :preserve_dir)
     end
 
     private

data/definitions/scenarios/packages.rb

@@ -73,12 +73,12 @@ module ForemanMaintain::Scenarios
       def compose
         if Packages.skip_installer_run?(context.get(:packages))
           add_step_with_context(Procedures::Packages::Install,
-                                :force => true, :warn_on_errors => true)
+            :force => true, :warn_on_errors => true)
         else
           add_step_with_context(Procedures::Packages::InstallerConfirmation)
           add_step_with_context(Procedures::Packages::UnlockVersions)
           add_step_with_context(Procedures::Packages::Install,
-                                :force => true, :warn_on_errors => true)
+            :force => true, :warn_on_errors => true)
           add_step_with_context(Procedures::Installer::Upgrade)
           add_step(Procedures::Packages::LockingStatus)
         end
@@ -86,9 +86,9 @@ module ForemanMaintain::Scenarios
 
       def set_context_mapping
         context.map(:packages,
-                    Procedures::Packages::Install => :packages)
+          Procedures::Packages::Install => :packages)
         context.map(:assumeyes,
-                    Procedures::Packages::Install => :assumeyes)
+          Procedures::Packages::Install => :assumeyes)
       end
     end
 
@@ -103,7 +103,7 @@ module ForemanMaintain::Scenarios
       def compose
         if Packages.skip_installer_run?(context.get(:packages))
           add_step_with_context(Procedures::Packages::Update,
-                                :force => true, :warn_on_errors => true)
+            :force => true, :warn_on_errors => true)
         else
           add_steps_with_context(
             Procedures::Packages::UpdateAllConfirmation,
@@ -111,7 +111,7 @@ module ForemanMaintain::Scenarios
           )
           add_step_with_context(Procedures::Packages::UnlockVersions)
           add_step_with_context(Procedures::Packages::Update,
-                                :force => true, :warn_on_errors => true)
+            :force => true, :warn_on_errors => true)
           add_step_with_context(Procedures::Installer::Upgrade)
           add_step(Procedures::Packages::LockingStatus)
         end
@@ -119,10 +119,10 @@ module ForemanMaintain::Scenarios
 
       def set_context_mapping
         context.map(:packages,
-                    Procedures::Packages::Update => :packages,
-                    Procedures::Packages::UpdateAllConfirmation => :packages)
+          Procedures::Packages::Update => :packages,
+          Procedures::Packages::UpdateAllConfirmation => :packages)
         context.map(:assumeyes,
-                    Procedures::Packages::Update => :assumeyes)
+          Procedures::Packages::Update => :assumeyes)
       end
     end
   end

data/definitions/scenarios/restore.rb

@@ -11,15 +11,15 @@ module ForemanMaintain::Scenarios
     end
 
     # rubocop:disable Metrics/MethodLength,Metrics/AbcSize
-    # rubocop:disable Metrics/CyclomaticComplexity,Metrics/PerceivedComplexity
+    # rubocop:disable Metrics/CyclomaticComplexity
     def compose
       backup = ForemanMaintain::Utils::Backup.new(context.get(:backup_dir))
 
       add_steps(find_checks(:root_user))
-      supported_version_check
       add_steps_with_context(Checks::Restore::ValidateBackup,
-                             Checks::Restore::ValidateHostname,
-                             Checks::Restore::ValidateInterfaces)
+        Checks::Restore::ValidateHostname,
+        Checks::Restore::ValidateInterfaces,
+        Checks::Restore::ValidatePostgresqlDumpPermissions)
 
       if context.get(:dry_run)
         self.class.metadata[:run_strategy] = :fail_slow
@@ -27,12 +27,11 @@ module ForemanMaintain::Scenarios
       end
 
       add_steps_with_context(Procedures::Restore::Confirmation,
-                             Procedures::Selinux::SetFileSecurity,
-                             Procedures::Restore::Configs)
+        Procedures::Selinux::SetFileSecurity,
+        Procedures::Restore::Configs)
       add_step_with_context(Procedures::Crond::Stop) if feature(:cron)
       unless backup.incremental?
-        add_steps_with_context(Procedures::Restore::EnsureMongoEngineMatches,
-                               Procedures::Restore::InstallerReset)
+        add_steps_with_context(Procedures::Restore::InstallerReset)
       end
       add_step_with_context(Procedures::Service::Stop)
       add_steps_with_context(Procedures::Restore::ExtractFiles) if backup.tar_backups_exist?
@@ -44,25 +43,24 @@ module ForemanMaintain::Scenarios
       if backup.sql_dump_files_exist? && feature(:instance).postgresql_local?
         add_step(Procedures::Service::Stop.new(:only => ['postgresql']))
       end
-      restore_mongo_dump(backup)
 
       if feature(:instance).postgresql_local? && !backup.online_backup?
         add_step_with_context(Procedures::Restore::ReindexDatabases)
       end
 
-      add_steps_with_context(Procedures::Pulp::Migrate,
-                             Procedures::Pulpcore::Migrate,
-                             Procedures::Restore::CandlepinResetMigrations)
+      add_steps_with_context(
+        Procedures::Pulpcore::Migrate,
+        Procedures::Restore::CandlepinResetMigrations
+      )
 
-      add_steps_with_context(Procedures::Restore::RegenerateQueues) if backup.online_backup?
       add_steps_with_context(Procedures::Service::Start,
-                             Procedures::Service::DaemonReload)
+        Procedures::Service::DaemonReload)
       add_step(Procedures::Installer::Upgrade.new(:assumeyes => true))
       add_step_with_context(Procedures::Installer::UpgradeRakeTask)
       add_step_with_context(Procedures::Crond::Start) if feature(:cron)
     end
     # rubocop:enable Metrics/MethodLength,Metrics/AbcSize
-    # rubocop:enable Metrics/CyclomaticComplexity,Metrics/PerceivedComplexity
+    # rubocop:enable Metrics/CyclomaticComplexity
 
     def drop_dbs(backup)
       if backup.file_map[:candlepin_dump][:present] ||
@@ -84,35 +82,21 @@ module ForemanMaintain::Scenarios
       end
     end
 
-    def restore_mongo_dump(backup)
-      if backup.file_map[:mongo_dump][:present]
-        add_steps_with_context(Procedures::Restore::MongoDump)
-      end
-    end
-
-    def supported_version_check
-      if feature(:instance).downstream && feature(:instance).downstream.less_than_version?('6.3')
-        msg = 'ERROR: Restore subcommand is supported by Satellite 6.3+. ' \
-              'Please use katello-restore instead.'
-        abort(msg)
-      end
-    end
-
     def set_context_mapping
       context.map(:backup_dir,
-                  Checks::Restore::ValidateBackup => :backup_dir,
-                  Checks::Restore::ValidateHostname => :backup_dir,
-                  Checks::Restore::ValidateInterfaces => :backup_dir,
-                  Procedures::Restore::Configs => :backup_dir,
-                  Procedures::Restore::DropDatabases => :backup_dir,
-                  Procedures::Restore::CandlepinDump => :backup_dir,
-                  Procedures::Restore::ForemanDump => :backup_dir,
-                  Procedures::Restore::PulpcoreDump => :backup_dir,
-                  Procedures::Restore::ExtractFiles => :backup_dir,
-                  Procedures::Restore::MongoDump => :backup_dir)
+        Checks::Restore::ValidateBackup => :backup_dir,
+        Checks::Restore::ValidateHostname => :backup_dir,
+        Checks::Restore::ValidateInterfaces => :backup_dir,
+        Checks::Restore::ValidatePostgresqlDumpPermissions => :backup_dir,
+        Procedures::Restore::Configs => :backup_dir,
+        Procedures::Restore::DropDatabases => :backup_dir,
+        Procedures::Restore::CandlepinDump => :backup_dir,
+        Procedures::Restore::ForemanDump => :backup_dir,
+        Procedures::Restore::PulpcoreDump => :backup_dir,
+        Procedures::Restore::ExtractFiles => :backup_dir)
 
       context.map(:incremental_backup,
-                  Procedures::Selinux::SetFileSecurity => :incremental_backup)
+        Procedures::Selinux::SetFileSecurity => :incremental_backup)
     end
   end
 

data/definitions/scenarios/self_upgrade.rb

@@ -26,18 +26,14 @@ module ForemanMaintain::Scenarios
     end
 
     def maintenance_repo(version)
-      if el7?
-        "rhel-#{el_major_version}-server-satellite-maintenance-#{version}-rpms"
-      else
-        "satellite-maintenance-#{version}-for-rhel-#{el_major_version}-x86_64-rpms"
-      end
+      "satellite-maintenance-#{version}-for-rhel-#{el_major_version}-x86_64-rpms"
     end
 
     def use_rhsm?
       return false if maintenance_repo_label
 
-      if (repo = ENV['MAINTENANCE_REPO_LABEL'])
-        return false unless repo.empty?
+      if (repo = ENV['MAINTENANCE_REPO_LABEL']) && !repo.empty?
+        return false
       end
 
       true
@@ -64,7 +60,7 @@ module ForemanMaintain::Scenarios
     metadata do
       label :self_upgrade_foreman_maintain
       description "Enables the specified version's maintenance repository and,"\
-  								"\nupdates the satellite-maintain packages"
+                  "\nupdates the satellite-maintain packages"
       manual_detection
     end
 
@@ -76,7 +72,7 @@ module ForemanMaintain::Scenarios
           "--enablerepo=#{id}"
         end
         add_step(Procedures::Packages::Update.new(packages: pkgs_to_update, assumeyes: true,
-                                                  yum_options: yum_options))
+          yum_options: yum_options))
       end
     end
 
@@ -94,14 +90,14 @@ module ForemanMaintain::Scenarios
 
     def rollback_repositories
       installed_release_pkg = package_manager.find_installed_package('foreman-release',
-                                                                     '%{VERSION}')
+        '%{VERSION}')
 
       unless current_version.nil? && installed_release_pkg.nil?
         current_major_version = current_version[0..2]
         installed_foreman_release_major_version = installed_release_pkg[0..2]
         if installed_foreman_release_major_version != current_major_version
           add_step(Procedures::Packages::Uninstall.new(packages: %w[foreman-release katello-repos],
-                                                       assumeyes: true))
+            assumeyes: true))
           add_step(Procedures::Repositories::Setup.new(:version => current_major_version))
         end
       end

data/definitions/scenarios/services.rb

@@ -14,13 +14,13 @@ module ForemanMaintain::Scenarios
 
     def set_context_mapping
       context.map(:only,
-                  Procedures::Service::Restart => :only)
+        Procedures::Service::Restart => :only)
 
       context.map(:exclude,
-                  Procedures::Service::Restart => :exclude)
+        Procedures::Service::Restart => :exclude)
 
       context.map(:wait_for_server_response,
-                  Procedures::Service::Restart => :wait_for_server_response)
+        Procedures::Service::Restart => :wait_for_server_response)
     end
   end
 
@@ -39,10 +39,10 @@ module ForemanMaintain::Scenarios
 
     def set_context_mapping
       context.map(:only,
-                  Procedures::Service::Stop => :only)
+        Procedures::Service::Stop => :only)
 
       context.map(:exclude,
-                  Procedures::Service::Stop => :exclude)
+        Procedures::Service::Stop => :exclude)
     end
   end
 
@@ -61,10 +61,10 @@ module ForemanMaintain::Scenarios
 
     def set_context_mapping
       context.map(:only,
-                  Procedures::Service::Start => :only)
+        Procedures::Service::Start => :only)
 
       context.map(:exclude,
-                  Procedures::Service::Start => :exclude)
+        Procedures::Service::Start => :exclude)
     end
   end
 
@@ -82,10 +82,10 @@ module ForemanMaintain::Scenarios
 
     def set_context_mapping
       context.map(:only,
-                  Procedures::Service::List => :only)
+        Procedures::Service::List => :only)
 
       context.map(:exclude,
-                  Procedures::Service::List => :exclude)
+        Procedures::Service::List => :exclude)
     end
   end
 
@@ -104,10 +104,10 @@ module ForemanMaintain::Scenarios
 
     def set_context_mapping
       context.map(:only,
-                  Procedures::Service::Enable => :only)
+        Procedures::Service::Enable => :only)
 
       context.map(:exclude,
-                  Procedures::Service::Enable => :exclude)
+        Procedures::Service::Enable => :exclude)
     end
   end
 
@@ -126,10 +126,10 @@ module ForemanMaintain::Scenarios
 
     def set_context_mapping
       context.map(:only,
-                  Procedures::Service::Disable => :only)
+        Procedures::Service::Disable => :only)
 
       context.map(:exclude,
-                  Procedures::Service::Disable => :exclude)
+        Procedures::Service::Disable => :exclude)
     end
   end
 
@@ -147,16 +147,16 @@ module ForemanMaintain::Scenarios
 
     def set_context_mapping
       context.map(:only,
-                  Procedures::Service::Status => :only)
+        Procedures::Service::Status => :only)
 
       context.map(:exclude,
-                  Procedures::Service::Status => :exclude)
+        Procedures::Service::Status => :exclude)
 
       context.map(:brief,
-                  Procedures::Service::Status => :brief)
+        Procedures::Service::Status => :brief)
 
       context.map(:failing,
-                  Procedures::Service::Status => :failing)
+        Procedures::Service::Status => :failing)
     end
   end
 end

data/definitions/scenarios/upgrade_to_capsule_6_14.rb

@@ -40,7 +40,6 @@ module Scenarios::Capsule_6_14
 
     def compose
       add_steps(find_procedures(:pre_migrations))
-      add_step(Procedures::Service::Stop.new)
     end
   end
 
@@ -58,7 +57,9 @@ module Scenarios::Capsule_6_14
       add_step(Procedures::Repositories::Setup.new(:version => '6.14'))
       modules_to_enable = ["satellite-capsule:#{el_short_name}"]
       add_step(Procedures::Packages::EnableModules.new(:module_names => modules_to_enable))
-      add_step(Procedures::Packages::UnlockVersions.new)
+      add_step(Procedures::Packages::Update.new(:assumeyes => true,
+        :yum_options => ['--downloadonly']))
+      add_step(Procedures::Service::Stop.new)
       add_step(Procedures::Packages::Update.new(:assumeyes => true))
       add_step_with_context(Procedures::Installer::Upgrade)
     end

data/definitions/scenarios/upgrade_to_capsule_6_14_z.rb

@@ -40,7 +40,6 @@ module Scenarios::Capsule_6_14_z
 
     def compose
       add_steps(find_procedures(:pre_migrations))
-      add_step(Procedures::Service::Stop.new)
     end
   end
 
@@ -58,7 +57,9 @@ module Scenarios::Capsule_6_14_z
       add_step(Procedures::Repositories::Setup.new(:version => '6.14'))
       modules_to_enable = ["satellite-capsule:#{el_short_name}"]
       add_step(Procedures::Packages::EnableModules.new(:module_names => modules_to_enable))
-      add_step(Procedures::Packages::UnlockVersions.new)
+      add_step(Procedures::Packages::Update.new(:assumeyes => true,
+        :yum_options => ['--downloadonly']))
+      add_step(Procedures::Service::Stop.new)
       add_step(Procedures::Packages::Update.new(:assumeyes => true))
       add_step_with_context(Procedures::Installer::Upgrade)
     end

data/definitions/scenarios/upgrade_to_katello_nightly.rb

@@ -54,6 +54,9 @@ module Scenarios::Katello_Nightly
       add_step(Procedures::Repositories::Setup.new(:version => 'nightly'))
       modules_to_enable = ["katello:#{el_short_name}", "pulpcore:#{el_short_name}"]
       add_step(Procedures::Packages::EnableModules.new(:module_names => modules_to_enable))
+      add_step(Procedures::Packages::Update.new(:assumeyes => true,
+        :yum_options => ['--downloadonly']))
+      add_step(Procedures::Service::Stop.new)
       add_step(Procedures::Packages::Update.new(:assumeyes => true))
       add_step_with_context(Procedures::Installer::Upgrade)
     end

data/definitions/scenarios/upgrade_to_satellite_6_14.rb

@@ -40,7 +40,6 @@ module Scenarios::Satellite_6_14
 
     def compose
       add_steps(find_procedures(:pre_migrations))
-      add_step(Procedures::Service::Stop.new)
     end
   end
 
@@ -59,7 +58,9 @@ module Scenarios::Satellite_6_14
       add_step(Procedures::Repositories::Setup.new(:version => '6.14'))
       modules_to_enable = ["satellite:#{el_short_name}"]
       add_step(Procedures::Packages::EnableModules.new(:module_names => modules_to_enable))
-      add_step(Procedures::Packages::UnlockVersions.new)
+      add_step(Procedures::Packages::Update.new(:assumeyes => true,
+        :yum_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::Installer::UpgradeRakeTask)

data/definitions/scenarios/upgrade_to_satellite_6_14_z.rb

@@ -40,7 +40,6 @@ module Scenarios::Satellite_6_14_z
 
     def compose
       add_steps(find_procedures(:pre_migrations))
-      add_step(Procedures::Service::Stop.new)
     end
   end
 
@@ -58,7 +57,9 @@ module Scenarios::Satellite_6_14_z
       add_step(Procedures::Repositories::Setup.new(:version => '6.14'))
       modules_to_enable = ["satellite:#{el_short_name}"]
       add_step(Procedures::Packages::EnableModules.new(:module_names => modules_to_enable))
-      add_step(Procedures::Packages::UnlockVersions.new)
+      add_step(Procedures::Packages::Update.new(:assumeyes => true,
+        :yum_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::Installer::UpgradeRakeTask)

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

@@ -4,14 +4,12 @@ from dnfpluginscore import _, logger
 
 import configparser
 
+PROTECT_COMMANDS = ('install', 'downgrade', 'reinstall', 'distro-sync', 'swap', 'upgrade', 'upgrade-minimal')
+
 class ForemanProtector(dnf.Plugin):
     name = 'foreman-protector'
     config_name = 'foreman-protector'
 
-    def __init__(self,base,cli):
-        self.base = base
-        self.cli = cli
-
     def _get_whitelist_file_url(self):
         try:
              parser = self.read_config(self.base.conf)
@@ -53,6 +51,8 @@ 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:
+            return
         whitelist_and_obsoletes = self._add_obsoletes()
         all_available_packages = self.base.sack.query().available()
         excluded_pkgs_query = all_available_packages.difference(whitelist_and_obsoletes)

data/extras/foreman_protector/foreman-protector.whitelist

@@ -17,12 +17,6 @@ boost-random
 boost-iostreams
 boost-thread
 yum-utils
-# el7 psql client dependencies
-rh-postgresql12-postgresql
-rh-postgresql12-postgresql-libs
-rh-postgresql12-postgresql-syspaths
-rh-postgresql12-runtime
-scl-utils
 # el8 psql client dependencies
 postgresql
 libpq