foreman_maintain 1.0.5 → 1.0.8

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: bda89886170f69276ffe2a0fcca046581c62096011e59251f199d451a6e49ddb
-  data.tar.gz: 5f63a1d69ab49281d15e1d4004f1726d9c7b45eccbeeaa0015615176c7973e01
+  metadata.gz: cbe5e2f041a482d1800b74195b3d0cbaeb504d14345c86402d4ee9402f052999
+  data.tar.gz: 96420eefe94c8632ec43a52d105af613aaf7b30107e59f6a69abc9549a02200b
 SHA512:
-  metadata.gz: a2e1859b3479357698652f5b448e97e9ebe4977b6f71a851efc7498ae8f9e622d4a0a69a6589a8206d00071129345bceacececf04133fb958f85924c9c5ba79b
-  data.tar.gz: 4db6f08840e3767357d0d57a9b32ff61779627e03118396ca41c99f2ea3f7ea355596e7d353dc1352b56290b7c4fc6b81a17bf74dad09cadf76b52af660cfc32
+  metadata.gz: 2207cfef121cf8a15ce12c0c961b249b31ac3fb92b2275c15df58b245fc987261c634d53bd0fad5cfe8de3c71106fd30016f76fa7ffac67da2b5ab593fb02347
+  data.tar.gz: a121716d79737dbe7e480bca7aa767dd17090226d8ef51f19c9f49e8ce82b7b8620416bc5cecc2a654068f7a7e0d0ed8ba93dbf2eedac71ccbbb36517f7bbd0b

data/definitions/features/foreman_tasks.rb

@@ -82,15 +82,22 @@ class Features::ForemanTasks < ForemanMaintain::Feature
   def delete(state)
     tasks_condition = condition(state)
 
-    feature(:foreman_database).psql(<<-SQL)
-     BEGIN;
-       DELETE FROM dynflow_steps USING foreman_tasks_tasks WHERE (foreman_tasks_tasks.external_id = dynflow_steps.execution_plan_uuid::varchar) AND #{tasks_condition};
-       DELETE FROM dynflow_actions USING foreman_tasks_tasks WHERE (foreman_tasks_tasks.external_id = dynflow_actions.execution_plan_uuid::varchar) AND #{tasks_condition};
-       DELETE FROM dynflow_execution_plans USING foreman_tasks_tasks WHERE (foreman_tasks_tasks.external_id = dynflow_execution_plans.uuid::varchar) AND #{tasks_condition};
-       DELETE FROM foreman_tasks_tasks WHERE #{tasks_condition};
-     COMMIT;
+    sql = <<-SQL
+      DELETE FROM dynflow_steps USING foreman_tasks_tasks WHERE (foreman_tasks_tasks.external_id = dynflow_steps.execution_plan_uuid::varchar) AND #{tasks_condition};
+      DELETE FROM dynflow_actions USING foreman_tasks_tasks WHERE (foreman_tasks_tasks.external_id = dynflow_actions.execution_plan_uuid::varchar) AND #{tasks_condition};
+      DELETE FROM dynflow_execution_plans USING foreman_tasks_tasks WHERE (foreman_tasks_tasks.external_id = dynflow_execution_plans.uuid::varchar) AND #{tasks_condition};
+      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);
     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)
   end
 

data/definitions/procedures/packages/enable_version_locking.rb

@@ -6,7 +6,11 @@ module Procedures::Packages
     end
 
     def run
-      package_manager.install_version_locking(:assumeyes => @assumeyes)
+      installed_fm_packages = []
+      ['satellite-maintain', 'rubygem-foreman_maintain'].each do |pkg|
+        installed_fm_packages << find_package(pkg)
+      end
+      package_manager.reinstall(installed_fm_packages, :assumeyes => @assumeyes)
     end
   end
 end

data/definitions/procedures/packages/lock_versions.rb

@@ -2,7 +2,9 @@ module Procedures::Packages
   class LockVersions < ForemanMaintain::Procedure
     metadata do
       description 'Lock packages'
-      preparation_steps { [Checks::VersionLockingEnabled.new] }
+      confine do
+        package_manager.version_locking_supported?
+      end
     end
 
     def run

data/definitions/procedures/packages/locking_status.rb

@@ -2,7 +2,9 @@ module Procedures::Packages
   class LockingStatus < ForemanMaintain::Procedure
     metadata do
       description 'Check status of version locking of packages'
-      preparation_steps { [Checks::VersionLockingEnabled.new] }
+      confine do
+        package_manager.version_locking_supported?
+      end
     end
 
     def run

data/definitions/procedures/packages/unlock_versions.rb

@@ -2,7 +2,9 @@ module Procedures::Packages
   class UnlockVersions < ForemanMaintain::Procedure
     metadata do
       description 'Unlock packages'
-      preparation_steps { [Checks::VersionLockingEnabled.new] }
+      confine do
+        package_manager.version_locking_supported?
+      end
     end
 
     def run

data/definitions/scenarios/self_upgrade.rb

@@ -13,15 +13,22 @@ module ForemanMaintain::Scenarios
     end
 
     def target_version
-      @target_version ||= context.get(:target_version)
+      current_full_version = feature(:instance).downstream.current_version
+      @target_version ||= current_full_version.bump
     end
 
     def current_version
       feature(:instance).downstream.current_minor_version
     end
 
+    def maintenance_repo_label
+      @maintenance_repo_label ||= context.get(:maintenance_repo_label)
+    end
+
     def maintenance_repo_id(version)
-      if (repo = ENV['maintenance_repo'])
+      if maintenance_repo_label
+        return maintenance_repo_label
+      elsif (repo = ENV['MAINTENANCE_REPO_LABEL'])
         return repo unless repo.empty?
       end
 
@@ -64,7 +71,9 @@ module ForemanMaintain::Scenarios
     end
 
     def use_rhsm?
-      if (repo = ENV['maintenance_repo'])
+      return false if maintenance_repo_label
+
+      if (repo = ENV['MAINTENANCE_REPO_LABEL'])
         return false unless repo.empty?
       end
 

data/definitions/scenarios/{upgrade_to_capsule_7_0.rb → upgrade_to_capsule_6_11.rb}

@@ -1,4 +1,4 @@
-module Scenarios::Capsule_7_0
+module Scenarios::Capsule_6_11
   class Abstract < ForemanMaintain::Scenario
     def self.upgrade_metadata(&block)
       metadata do
@@ -6,20 +6,20 @@ module Scenarios::Capsule_7_0
         confine do
           feature(:capsule) &&
             (feature(:capsule).current_minor_version == '6.10' || \
-            ForemanMaintain.upgrade_in_progress == '7.0')
+            ForemanMaintain.upgrade_in_progress == '6.11')
         end
         instance_eval(&block)
       end
     end
 
     def target_version
-      '7.0'
+      '6.11'
     end
   end
 
   class PreUpgradeCheck < Abstract
     upgrade_metadata do
-      description 'Checks before upgrading to Capsule 7.0'
+      description 'Checks before upgrading to Capsule 6.11'
       tags :pre_upgrade_checks
       run_strategy :fail_slow
     end
@@ -27,13 +27,13 @@ module Scenarios::Capsule_7_0
     def compose
       add_steps(find_checks(:default))
       add_steps(find_checks(:pre_upgrade))
-      add_step(Checks::Repositories::Validate.new(:version => '7.0'))
+      add_step(Checks::Repositories::Validate.new(:version => '6.11'))
     end
   end
 
   class PreMigrations < Abstract
     upgrade_metadata do
-      description 'Procedures before migrating to Capsule 7.0'
+      description 'Procedures before migrating to Capsule 6.11'
       tags :pre_migrations
     end
 
@@ -46,7 +46,7 @@ module Scenarios::Capsule_7_0
 
   class Migrations < Abstract
     upgrade_metadata do
-      description 'Migration scripts to Capsule 7.0'
+      description 'Migration scripts to Capsule 6.11'
       tags :migrations
     end
 
@@ -55,7 +55,7 @@ module Scenarios::Capsule_7_0
     end
 
     def compose
-      add_step(Procedures::Repositories::Setup.new(:version => '7.0'))
+      add_step(Procedures::Repositories::Setup.new(:version => '6.11'))
       add_step(Procedures::Packages::UnlockVersions.new)
       add_step(Procedures::Packages::Update.new(:assumeyes => true))
       add_step_with_context(Procedures::Installer::Upgrade)
@@ -64,7 +64,7 @@ module Scenarios::Capsule_7_0
 
   class PostMigrations < Abstract
     upgrade_metadata do
-      description 'Procedures after migrating to Capsule 7.0'
+      description 'Procedures after migrating to Capsule 6.11'
       tags :post_migrations
     end
 
@@ -77,7 +77,7 @@ module Scenarios::Capsule_7_0
 
   class PostUpgradeChecks < Abstract
     upgrade_metadata do
-      description 'Checks after upgrading to Capsule 7.0'
+      description 'Checks after upgrading to Capsule 6.11'
       tags :post_upgrade_checks
       run_strategy :fail_slow
     end

data/definitions/scenarios/{upgrade_to_capsule_7_0_z.rb → upgrade_to_capsule_6_11_z.rb}

@@ -1,25 +1,25 @@
-module Scenarios::Capsule_7_0_z
+module Scenarios::Capsule_6_11_z
   class Abstract < ForemanMaintain::Scenario
     def self.upgrade_metadata(&block)
       metadata do
         tags :upgrade_scenario
         confine do
           feature(:capsule) &&
-            (feature(:capsule).current_minor_version == '7.0' || \
-              ForemanMaintain.upgrade_in_progress == '7.0.z')
+            (feature(:capsule).current_minor_version == '6.11' || \
+              ForemanMaintain.upgrade_in_progress == '6.11.z')
         end
         instance_eval(&block)
       end
     end
 
     def target_version
-      '7.0.z'
+      '6.11.z'
     end
   end
 
   class PreUpgradeCheck < Abstract
     upgrade_metadata do
-      description 'Checks before upgrading to Capsule 7.0.z'
+      description 'Checks before upgrading to Capsule 6.11.z'
       tags :pre_upgrade_checks
       run_strategy :fail_slow
     end
@@ -27,13 +27,13 @@ module Scenarios::Capsule_7_0_z
     def compose
       add_steps(find_checks(:default))
       add_steps(find_checks(:pre_upgrade))
-      add_step(Checks::Repositories::Validate.new(:version => '7.0'))
+      add_step(Checks::Repositories::Validate.new(:version => '6.11'))
     end
   end
 
   class PreMigrations < Abstract
     upgrade_metadata do
-      description 'Procedures before migrating to Capsule 7.0.z'
+      description 'Procedures before migrating to Capsule 6.11.z'
       tags :pre_migrations
     end
 
@@ -45,7 +45,7 @@ module Scenarios::Capsule_7_0_z
 
   class Migrations < Abstract
     upgrade_metadata do
-      description 'Migration scripts to Capsule 7.0.z'
+      description 'Migration scripts to Capsule 6.11.z'
       tags :migrations
     end
 
@@ -54,7 +54,7 @@ module Scenarios::Capsule_7_0_z
     end
 
     def compose
-      add_step(Procedures::Repositories::Setup.new(:version => '7.0'))
+      add_step(Procedures::Repositories::Setup.new(:version => '6.11'))
       add_step(Procedures::Packages::UnlockVersions.new)
       add_step(Procedures::Packages::Update.new(:assumeyes => true))
       add_step_with_context(Procedures::Installer::Upgrade)
@@ -63,7 +63,7 @@ module Scenarios::Capsule_7_0_z
 
   class PostMigrations < Abstract
     upgrade_metadata do
-      description 'Procedures after migrating to Capsule 7.0.z'
+      description 'Procedures after migrating to Capsule 6.11.z'
       tags :post_migrations
     end
 
@@ -76,7 +76,7 @@ module Scenarios::Capsule_7_0_z
 
   class PostUpgradeChecks < Abstract
     upgrade_metadata do
-      description 'Checks after upgrading to Capsule 7.0.z'
+      description 'Checks after upgrading to Capsule 6.11.z'
       tags :post_upgrade_checks
       run_strategy :fail_slow
     end

data/definitions/scenarios/{upgrade_to_satellite_7_0.rb → upgrade_to_satellite_6_11.rb}

@@ -1,4 +1,4 @@
-module Scenarios::Satellite_7_0
+module Scenarios::Satellite_6_11
   class Abstract < ForemanMaintain::Scenario
     def self.upgrade_metadata(&block)
       metadata do
@@ -6,20 +6,20 @@ module Scenarios::Satellite_7_0
         confine do
           feature(:satellite) &&
             (feature(:satellite).current_minor_version == '6.10' || \
-            ForemanMaintain.upgrade_in_progress == '7.0')
+            ForemanMaintain.upgrade_in_progress == '6.11')
         end
         instance_eval(&block)
       end
     end
 
     def target_version
-      '7.0'
+      '6.11'
     end
   end
 
   class PreUpgradeCheck < Abstract
     upgrade_metadata do
-      description 'Checks before upgrading to Satellite 7.0'
+      description 'Checks before upgrading to Satellite 6.11'
       tags :pre_upgrade_checks
       run_strategy :fail_slow
     end
@@ -29,13 +29,13 @@ module Scenarios::Satellite_7_0
       add_steps(find_checks(:pre_upgrade))
 
       add_step(Checks::Foreman::CheckpointSegments)
-      add_step(Checks::Repositories::Validate.new(:version => '7.0'))
+      add_step(Checks::Repositories::Validate.new(:version => '6.11'))
     end
   end
 
   class PreMigrations < Abstract
     upgrade_metadata do
-      description 'Procedures before migrating to Satellite 7.0'
+      description 'Procedures before migrating to Satellite 6.11'
       tags :pre_migrations
     end
 
@@ -48,7 +48,7 @@ module Scenarios::Satellite_7_0
 
   class Migrations < Abstract
     upgrade_metadata do
-      description 'Migration scripts to Satellite 7.0'
+      description 'Migration scripts to Satellite 6.11'
       tags :migrations
       run_strategy :fail_fast
     end
@@ -58,7 +58,7 @@ module Scenarios::Satellite_7_0
     end
 
     def compose
-      add_step(Procedures::Repositories::Setup.new(:version => '7.0'))
+      add_step(Procedures::Repositories::Setup.new(:version => '6.11'))
       add_step(Procedures::Packages::UnlockVersions.new)
       add_step(Procedures::Packages::Update.new(:assumeyes => true))
       add_step_with_context(Procedures::Installer::Upgrade)
@@ -68,7 +68,7 @@ module Scenarios::Satellite_7_0
 
   class PostMigrations < Abstract
     upgrade_metadata do
-      description 'Procedures after migrating to Satellite 7.0'
+      description 'Procedures after migrating to Satellite 6.11'
       tags :post_migrations
     end
 
@@ -81,7 +81,7 @@ module Scenarios::Satellite_7_0
 
   class PostUpgradeChecks < Abstract
     upgrade_metadata do
-      description 'Checks after upgrading to Satellite 7.0'
+      description 'Checks after upgrading to Satellite 6.11'
       tags :post_upgrade_checks
       run_strategy :fail_slow
     end

data/definitions/scenarios/{upgrade_to_satellite_7_0_z.rb → upgrade_to_satellite_6_11_z.rb}

@@ -1,25 +1,25 @@
-module Scenarios::Satellite_7_0_z
+module Scenarios::Satellite_6_11_z
   class Abstract < ForemanMaintain::Scenario
     def self.upgrade_metadata(&block)
       metadata do
         tags :upgrade_scenario
         confine do
           feature(:satellite) &&
-            (feature(:satellite).current_minor_version == '7.0' || \
-            ForemanMaintain.upgrade_in_progress == '7.0.z')
+            (feature(:satellite).current_minor_version == '6.11' || \
+            ForemanMaintain.upgrade_in_progress == '6.11.z')
         end
         instance_eval(&block)
       end
     end
 
     def target_version
-      '7.0.z'
+      '6.11.z'
     end
   end
 
   class PreUpgradeCheck < Abstract
     upgrade_metadata do
-      description 'Checks before upgrading to Satellite 7.0.z'
+      description 'Checks before upgrading to Satellite 6.11.z'
       tags :pre_upgrade_checks
       run_strategy :fail_slow
     end
@@ -27,13 +27,13 @@ module Scenarios::Satellite_7_0_z
     def compose
       add_steps(find_checks(:default))
       add_steps(find_checks(:pre_upgrade))
-      add_step(Checks::Repositories::Validate.new(:version => '7.0'))
+      add_step(Checks::Repositories::Validate.new(:version => '6.11'))
     end
   end
 
   class PreMigrations < Abstract
     upgrade_metadata do
-      description 'Procedures before migrating to Satellite 7.0.z'
+      description 'Procedures before migrating to Satellite 6.11.z'
       tags :pre_migrations
     end
 
@@ -45,7 +45,7 @@ module Scenarios::Satellite_7_0_z
 
   class Migrations < Abstract
     upgrade_metadata do
-      description 'Migration scripts to Satellite 7.0.z'
+      description 'Migration scripts to Satellite 6.11.z'
       tags :migrations
     end
 
@@ -54,7 +54,7 @@ module Scenarios::Satellite_7_0_z
     end
 
     def compose
-      add_step(Procedures::Repositories::Setup.new(:version => '7.0'))
+      add_step(Procedures::Repositories::Setup.new(:version => '6.11'))
       add_step(Procedures::Packages::UnlockVersions.new)
       add_step(Procedures::Packages::Update.new(:assumeyes => true))
       add_step_with_context(Procedures::Installer::Upgrade)
@@ -64,7 +64,7 @@ module Scenarios::Satellite_7_0_z
 
   class PostMigrations < Abstract
     upgrade_metadata do
-      description 'Procedures after migrating to Satellite 7.0.z'
+      description 'Procedures after migrating to Satellite 6.11.z'
       tags :post_migrations
     end
 
@@ -77,7 +77,7 @@ module Scenarios::Satellite_7_0_z
 
   class PostUpgradeChecks < Abstract
     upgrade_metadata do
-      description 'Checks after upgrading to Satellite 7.0.z'
+      description 'Checks after upgrading to Satellite 6.11.z'
       tags :post_upgrade_checks
       run_strategy :fail_slow
     end

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

@@ -0,0 +1,77 @@
+import dnf
+import dnf.exceptions
+from dnfpluginscore import _, logger
+
+import configparser
+
+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)
+        except Exception as e:
+            raise dnf.exceptions.Error(_("Parsing file failed: {}").format(str(e)))
+
+        if parser.has_section('main'):
+            fileurl = parser.get('main', 'whitelist')
+        else:
+            raise dnf.exceptions.Error(_('Incorrect plugin configuration!'))
+        return fileurl
+
+    def _load_whitelist(self):
+        fileurl = self._get_whitelist_file_url()
+        package_whitelist = set()
+        try:
+            if fileurl:
+                llfile = open(fileurl, 'r')
+                for line in llfile.readlines():
+                    if line.startswith('#') or line.strip() == '':
+                        continue
+
+                    package_whitelist.add(line.rstrip())
+                llfile.close()
+        except IOError as e:
+            raise dnf.exceptions.Error('Unable to read Foreman protector"s configuration: %s' % e)
+        return package_whitelist
+
+    def _add_obsoletes(self):
+        package_whitelist = self._load_whitelist()
+        final_query = self.base.sack.query()
+        if package_whitelist:
+        #  If anything obsoletes something that we have whitelisted ... then
+        # whitelist that too.
+            whitelist_query = self.base.sack.query().filterm(name=package_whitelist)
+            obsoletes_query = self.base.sack.query().filterm(obsoletes=list(whitelist_query))
+
+            final_query = whitelist_query.union(obsoletes_query)
+        return final_query
+
+    def sack(self):
+        whitelist_and_obsoletes = self._add_obsoletes()
+        all_available_packages = self.base.sack.query().available()
+        excluded_pkgs_query = all_available_packages.difference(whitelist_and_obsoletes)
+        total = len(excluded_pkgs_query)
+        logger.info(_('Reading Foreman protector configuration'))
+        self.base.sack.add_excludes(excluded_pkgs_query)
+
+        logger.info(_('*** Excluded total: %s' % total))
+        if total:
+            if total > 1:
+                suffix = 's'
+            else:
+                suffix = ''
+            logger.info(_('\n'
+                            'WARNING: Excluding %d package%s due to foreman-protector. \n'
+                            'Use foreman-maintain packages install/update <package> \n'
+                            'to safely install packages without restrictions.\n'
+                            'Use foreman-maintain upgrade run for full upgrade.\n'
+                            % (total, suffix)))
+        else:
+            logger.info(_('\n'
+                            'Nothing excluded by foreman-protector!\n'))

data/extras/foreman_protector/foreman-protector.whitelist

@@ -17,5 +17,8 @@ boost-random
 boost-iostreams
 boost-thread
 yum-utils
+# el8 yum-utils dependencies
+dnf-plugins-core
+python3-dnf-plugins-core
 # foreman-maintain
 rubygem-foreman_maintain

data/lib/foreman_maintain/cli/self_upgrade_command.rb

@@ -1,38 +1,23 @@
 module ForemanMaintain
   module Cli
     class SelfUpgradeCommand < Base
-      option ['--target-version'], 'TARGET_VERSION',\
-             'Major version of the Satellite or Capsule'\
-           	', e.g 7.0', :required => true
+      option ['--maintenance-repo-label'], 'REPOSITORY_LABEL',\
+             'Repository label from which packages should be updated.'\
+             'This can be used when standard CDN repositories are unavailable.'
       def execute
-        allow_major_version_upgrade_only
         run_scenario(upgrade_scenario, upgrade_rescue_scenario)
       end
 
       def upgrade_scenario
-        Scenarios::SelfUpgrade.new(target_version: target_version)
+        Scenarios::SelfUpgrade.new(
+          maintenance_repo_label: maintenance_repo_label
+        )
       end
 
       def upgrade_rescue_scenario
-        Scenarios::SelfUpgradeRescue.new(target_version: target_version)
-      end
-
-      def current_downstream_version
-        ForemanMaintain.detector.feature(:instance).downstream.current_version
-      end
-
-      def allow_major_version_upgrade_only
-        begin
-          next_version = Gem::Version.new(target_version)
-        rescue ArgumentError => err
-          raise Error::UsageError, "Invalid version! #{err}"
-        end
-        if current_downstream_version >= next_version
-          message = "The target-version #{target_version} should be "\
-                    "greater than existing version #{current_downstream_version},"\
-                    "\nand self-upgrade should be used for major version upgrades only!"
-          raise Error::UsageError, message
-        end
+        Scenarios::SelfUpgradeRescue.new(
+          maintenance_repo_label: maintenance_repo_label
+        )
       end
     end
   end

data/lib/foreman_maintain/concerns/downstream.rb

@@ -116,7 +116,7 @@ module ForemanMaintain
       end
 
       def common_repos(full_version)
-        sat_maint_version = if version(full_version) >= version('7.0') && !use_beta_repos?
+        sat_maint_version = if version(full_version) >= version('6.11') && !use_beta_repos?
                               full_version
                             else
                               full_version[0]

data/lib/foreman_maintain/package_manager/base.rb

@@ -1,13 +1,8 @@
 module ForemanMaintain::PackageManager
   # rubocop:disable Lint/UnusedMethodArgument
   class Base
-    # check tools are installed and enabled
-    def version_locking_enabled?
-      raise NotImplementedError
-    end
-
-    # make sure the version locking tools are configured
-    def install_version_locking(assumeyes: false)
+    # confirms that Package Manager supports the locking mechanism
+    def version_locking_supported?
       raise NotImplementedError
     end
 

data/lib/foreman_maintain/package_manager/dnf.rb

@@ -5,6 +5,10 @@ module ForemanMaintain::PackageManager
       super
     end
 
+    def version_locking_supported?
+      true
+    end
+
     private
 
     def dnf_action(action, packages, with_status: false, assumeyes: false)

data/lib/foreman_maintain/package_manager/yum.rb

@@ -2,7 +2,6 @@ module ForemanMaintain::PackageManager
   class Yum < Base
     PROTECTOR_CONFIG_FILE = '/etc/yum/pluginconf.d/foreman-protector.conf'.freeze
     PROTECTOR_WHITELIST_FILE = '/etc/yum/pluginconf.d/foreman-protector.whitelist'.freeze
-    PROTECTOR_PLUGIN_FILE = '/usr/lib/yum-plugins/foreman-protector.py'.freeze
 
     def self.parse_envra(envra)
       # envra format: 0:foreman-1.20.1.10-1.el7sat.noarch
@@ -19,18 +18,17 @@ module ForemanMaintain::PackageManager
     end
 
     def versions_locked?
-      !!(protector_config =~ /^\s*enabled\s*=\s*1/)
+      !!(protector_config =~ /^\s*enabled\s*=\s*1/) &&
+        protector_whitelist_file_nonzero?
     end
 
-    def version_locking_enabled?
-      File.exist?(PROTECTOR_PLUGIN_FILE) && File.exist?(PROTECTOR_CONFIG_FILE) &&
-        File.exist?(PROTECTOR_WHITELIST_FILE)
+    def protector_whitelist_file_nonzero?
+      File.exist?(PROTECTOR_WHITELIST_FILE) &&
+        !File.zero?(PROTECTOR_WHITELIST_FILE)
     end
 
-    def install_version_locking(*)
-      install_extras('foreman_protector/foreman-protector.py', PROTECTOR_PLUGIN_FILE)
-      install_extras('foreman_protector/foreman-protector.conf', PROTECTOR_CONFIG_FILE)
-      install_extras('foreman_protector/foreman-protector.whitelist', PROTECTOR_WHITELIST_FILE)
+    def version_locking_supported?
+      true
     end
 
     def installed?(packages)
@@ -49,6 +47,10 @@ module ForemanMaintain::PackageManager
       yum_action('install', packages, :assumeyes => assumeyes)
     end
 
+    def reinstall(packages, assumeyes: false)
+      yum_action('reinstall', packages, :assumeyes => assumeyes)
+    end
+
     def remove(packages, assumeyes: false)
       yum_action('remove', packages, :assumeyes => assumeyes)
     end
@@ -129,14 +131,5 @@ module ForemanMaintain::PackageManager
                      :interactive => !assumeyes, :valid_exit_statuses => valid_exit_statuses)
       end
     end
-
-    def install_extras(src, dest, override: false)
-      extras_src = File.expand_path('../../../../extras', __FILE__)
-      if override ||
-         (File.directory?(dest) && !File.exist?(File.join(dest, src))) ||
-         !File.exist?(dest)
-        FileUtils.cp(File.join(extras_src, src), dest)
-      end
-    end
   end
 end

data/lib/foreman_maintain/version.rb

@@ -1,3 +1,3 @@
 module ForemanMaintain
-  VERSION = '1.0.5'.freeze
+  VERSION = '1.0.8'.freeze
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: foreman_maintain
 version: !ruby/object:Gem::Version
-  version: 1.0.5
+  version: 1.0.8
 platform: ruby
 authors:
 - Ivan Nečas
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2022-03-30 00:00:00.000000000 Z
+date: 2022-04-22 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: clamp
@@ -184,7 +184,6 @@ files:
 - definitions/checks/server_ping.rb
 - definitions/checks/services_up.rb
 - definitions/checks/system_registration.rb
-- definitions/checks/version_locking_enabled.rb
 - definitions/features/apache.rb
 - definitions/features/candlepin.rb
 - definitions/features/candlepin_database.rb
@@ -334,14 +333,16 @@ files:
 - definitions/scenarios/services.rb
 - definitions/scenarios/upgrade_to_capsule_6_10.rb
 - definitions/scenarios/upgrade_to_capsule_6_10_z.rb
+- definitions/scenarios/upgrade_to_capsule_6_11.rb
+- definitions/scenarios/upgrade_to_capsule_6_11_z.rb
 - definitions/scenarios/upgrade_to_capsule_6_8.rb
 - definitions/scenarios/upgrade_to_capsule_6_8_z.rb
 - definitions/scenarios/upgrade_to_capsule_6_9.rb
 - definitions/scenarios/upgrade_to_capsule_6_9_z.rb
-- definitions/scenarios/upgrade_to_capsule_7_0.rb
-- definitions/scenarios/upgrade_to_capsule_7_0_z.rb
 - definitions/scenarios/upgrade_to_satellite_6_10.rb
 - definitions/scenarios/upgrade_to_satellite_6_10_z.rb
+- definitions/scenarios/upgrade_to_satellite_6_11.rb
+- definitions/scenarios/upgrade_to_satellite_6_11_z.rb
 - definitions/scenarios/upgrade_to_satellite_6_2.rb
 - definitions/scenarios/upgrade_to_satellite_6_2_z.rb
 - definitions/scenarios/upgrade_to_satellite_6_3.rb
@@ -358,12 +359,11 @@ files:
 - definitions/scenarios/upgrade_to_satellite_6_8_z.rb
 - definitions/scenarios/upgrade_to_satellite_6_9.rb
 - definitions/scenarios/upgrade_to_satellite_6_9_z.rb
-- definitions/scenarios/upgrade_to_satellite_7_0.rb
-- definitions/scenarios/upgrade_to_satellite_7_0_z.rb
 - extras/foreman-maintain.sh
+- extras/foreman_protector/dnf/foreman-protector.py
 - extras/foreman_protector/foreman-protector.conf
-- extras/foreman_protector/foreman-protector.py
 - extras/foreman_protector/foreman-protector.whitelist
+- extras/foreman_protector/yum/foreman-protector.py
 - extras/passenger-recycler.cron
 - lib/foreman_maintain.rb
 - lib/foreman_maintain/check.rb

data/definitions/checks/version_locking_enabled.rb

@@ -1,14 +0,0 @@
-module Checks
-  class VersionLockingEnabled < ForemanMaintain::Check
-    metadata do
-      description 'Check if tooling for package locking is installed'
-    end
-
-    def run
-      enabled = package_manager.version_locking_enabled?
-      enable_locking = Procedures::Packages::EnableVersionLocking.new(:assumeyes => assumeyes?)
-      assert(enabled, 'Tools for package version locking are not available on this system',
-             :next_steps => enable_locking)
-    end
-  end
-end