foreman_maintain 0.8.31 → 0.9.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 5a60ab5a7e89c406aa5a1821ec0786f4a523e8ff099624c5f7e08fa1ea0c01e6
-  data.tar.gz: bda6f1436f8719c7c4888b07b494110101c06a3696f7d3cbf177f516d538e7db
+  metadata.gz: e995fb504729078ae910121820a8f286d1256b4319d07d25f27a17768ba515af
+  data.tar.gz: 8fb3b6231928b49a6c6cd8375a14394b31839452ead4c0a7e3dbc198f405912d
 SHA512:
-  metadata.gz: 1101a4af2af8e7d70bee47ac87cfbbf2f7c6eed2d47f0f61abd11995fc075c9314854520de7df3e8a2bce7447ea1557290c932aa82ff14ff2de08c11c65a8a66
-  data.tar.gz: 98256752a9d3b1e796ac7159eaea5751dffa1d7e54ada6a4b19c4aaca98896b1008c12985005c003db7d7b8d31731e29f88c72cdedb36b2df5865edf5da87ff6
+  metadata.gz: 12ff59c3185962df60825149e3f34892c6bc42071fb39b35aa701b891dd34eb71843784c161e64d0218e669e66a2f85715991f76a319f48f6fb4dbeba55ddf2f
+  data.tar.gz: 747024ed62640c6c49406f573557253e6ea96037921633ca94489c20f34f32a1a233c4f6a9bb67bdac45aa9dd8af9bb727733f7531c8d0c5303f56ce59a8ce60

data/definitions/checks/check_for_newer_packages.rb

@@ -33,11 +33,9 @@ class Checks::CheckForNewerPackages < ForemanMaintain::Check
     end
 
     unless packages_with_updates.empty?
-      command = ForemanMaintain.pkg_and_cmd_name[1]
-      fail! 'Required updates for some packages detected.'\
-        "\nPlease update to the latest #{@manual_confirmation_version}.z release "\
-        'before proceeding, using:'\
-        "\n# #{command} upgrade run --target-version #{@manual_confirmation_version}.z"
+      failure_message = 'An update is available for package(s): '\
+                        "#{packages_with_updates.join(',')}. Please update before proceeding!"
+      fail! failure_message
     end
   end
 

data/definitions/checks/disk/performance.rb

@@ -39,8 +39,8 @@ module Checks
         end
       end
 
-      def data_dirs
-        @data_dirs ||= %i[pulpcore_database mongo foreman_database].inject({}) do |dirs, f|
+      def default_dirs
+        @default_dirs ||= %i[pulp2 pulpcore_database mongo foreman_database].inject({}) do |dirs, f|
           if feature(f) && File.directory?(feature(f).data_dir)
             dirs[feature(f).label_dashed] = feature(f).data_dir
           end
@@ -48,32 +48,20 @@ module Checks
         end
       end
 
-      def pulp_dir
-        @pulp_dir ||= begin
-          pulp_feature = feature(:pulp2) || feature(:pulpcore_database)
-          { pulp_feature.label_dashed => pulp_feature.pulp_data_dir }
-        end
-      end
-
       def description
-        'Check recommended disk speed for '\
-        "#{[data_dirs.keys | pulp_dir.keys].join(', ')} directories."
-      end
-
-      def all_dirs
-        data_dirs.values | pulp_dir.values
+        "Check recommended disk speed for #{default_dirs.keys.join(', ')} directories."
       end
 
       def check_only_single_device?
-        all_dirs.each do |dir|
+        default_dirs.values do |dir|
           ForemanMaintain::Utils::Disk::Device.new(dir).name
         end.uniq.length <= 1
       end
 
       def dirs_to_check
-        return all_dirs.first(1) if check_only_single_device?
+        return default_dirs.values.first(1) if check_only_single_device?
 
-        all_dirs
+        default_dirs.values
       end
 
       private
@@ -86,10 +74,11 @@ module Checks
       def compute_disk_speed(spinner)
         success = true
         io_obj = ForemanMaintain::Utils::Disk::NilDevice.new
+
         dirs_to_check.each do |dir|
           io_obj = ForemanMaintain::Utils::Disk::Device.new(dir)
 
-          spinner.update("[Speed check In-Progress] device:#{io_obj.name}")
+          spinner.update("[Speed check In-Progress] device: #{io_obj.name}")
           stats << io_obj
 
           next if io_obj.read_speed >= EXPECTED_IO

data/definitions/checks/repositories/validate.rb

@@ -3,8 +3,7 @@ module Checks::Repositories
     metadata do
       description 'Validate availability of repositories'
       preparation_steps do
-        [Checks::Repositories::CheckNonRhRepository.new,
-         Procedures::Packages::Install.new(:packages => [ForemanMaintain::Utils::Facter.package])]
+        Checks::Repositories::CheckNonRhRepository.new
       end
 
       confine do

data/definitions/checks/restore/validate_interfaces.rb

@@ -0,0 +1,24 @@
+require 'foreman_maintain/utils/backup'
+
+module Checks::Restore
+  class ValidateInterfaces < ForemanMaintain::Check
+    metadata do
+      description 'Validate network interfaces match the backup'
+
+      param :backup_dir,
+            'Path to backup directory',
+            :required => true
+      manual_detection
+    end
+
+    def run
+      backup = ForemanMaintain::Utils::Backup.new(@backup_dir)
+      invalid_interfaces = backup.validate_interfaces
+      msg = 'The following features are enabled in the backup, '\
+        "\nbut the system does not have the interfaces used by these features: "
+      msg << invalid_interfaces.map { |k, v| "#{k} (#{v['configured']})" }.join(', ')
+      msg << '.'
+      assert(backup.validate_interfaces.empty?, msg)
+    end
+  end
+end

data/definitions/features/foreman_tasks.rb

@@ -17,17 +17,6 @@ class Features::ForemanTasks < ForemanMaintain::Feature
     Actions::Candlepin::ListenOnCandlepinEvents
     Actions::Katello::EventQueue::Monitor
     Actions::Insights::EmailPoller
-    ForemanInventoryUpload::Async::GenerateReportJob
-    ForemanInventoryUpload::Async::QueueForUploadJob
-    ForemanInventoryUpload::Async::UploadReportJob
-    InsightsCloud::Async::InsightsClientStatusAging
-    InsightsCloud::Async::InsightsFullSync
-    InsightsCloud::Async::InsightsResolutionsSync
-    InsightsCloud::Async::InsightsRulesSync
-    InventorySync::Async::InventoryFullSync
-    InventorySync::Async::InventoryHostsSync
-    InventorySync::Async::InventoryScheduledSync
-    InventorySync::Async::InventorySelfHostSync
   ].freeze
 
   metadata do
@@ -82,22 +71,15 @@ class Features::ForemanTasks < ForemanMaintain::Feature
   def delete(state)
     tasks_condition = condition(state)
 
-    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);
+    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
 
-    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/features/system_repos.rb

@@ -21,10 +21,6 @@ class Features::SystemRepos < ForemanMaintain::Feature
     Hash[*repos.delete!(' ').split("\n")]
   end
 
-  def enabled_repos_ids
-    trim_repoids(enabled_repos_hash.keys)
-  end
-
   def upstream_repos_ids
     trim_repoids(upstream_repos.keys)
   end
@@ -33,10 +29,6 @@ class Features::SystemRepos < ForemanMaintain::Feature
     execute!("yum-config-manager --disable #{repo_ids.join(',')}")
   end
 
-  def enable_repos(repo_ids)
-    execute!("yum-config-manager --enable #{repo_ids.join(',')}")
-  end
-
   private
 
   def trim_repoids(repos)

data/definitions/procedures/backup/metadata.rb

@@ -9,6 +9,8 @@ module Procedures::Backup
       param :online_backup, 'Select for online backup', :flag => true, :default => false
     end
 
+    PROXY_CONFIG_ENTRIES = %w[dns dns_interface dhcp dhcp_interface].freeze
+
     def run
       with_spinner('Collecting metadata') do |spinner|
         metadata = {}
@@ -18,6 +20,8 @@ module Procedures::Backup
         metadata['rpms'] = rpms(spinner)
         metadata['incremental'] = @incremental_dir || false
         metadata['online'] = @online_backup
+        metadata['hostname'] = hostname
+        metadata['proxy_config'] = proxy_config(spinner)
         save_metadata(metadata, spinner)
       end
     end
@@ -54,5 +58,12 @@ module Procedures::Backup
         feature(:foreman_proxy).features
       end
     end
+
+    def proxy_config(spinner)
+      spinner.update('Collecting proxy configuration')
+      feature(:installer).answers['foreman_proxy'].select do |key, _|
+        PROXY_CONFIG_ENTRIES.include?(key)
+      end
+    end
   end
 end

data/definitions/procedures/content/prepare.rb

@@ -4,14 +4,13 @@ module Procedures::Content
       description 'Prepare content for Pulp 3'
       for_feature :pulpcore
       param :quiet, 'Keep the output on a single line', :flag => true, :default => false
-      do_not_whitelist
     end
 
     def run
       sleep(20) # in satellite 6.9 the services are still coming up
       # use interactive to get realtime output
       env_vars = @quiet ? '' : 'preserve_output=true '
-      execute!("#{env_vars}foreman-rake katello:pulp3_migration", :interactive => true)
+      puts execute!("#{env_vars}foreman-rake katello:pulp3_migration", :interactive => true)
     end
   end
 end

data/definitions/procedures/content/switchover.rb

@@ -9,7 +9,6 @@ module Procedures::Content
       end
 
       param :skip_deb, 'Do not run debian options in installer.'
-      do_not_whitelist
     end
 
     def run

data/definitions/procedures/installer/upgrade_rake_task.rb

@@ -5,9 +5,7 @@ module Procedures::Installer
     end
 
     def run
-      # only run this in the Satellite scenario, as in others
-      # the installer runs this rake task for us already
-      execute!('foreman-rake upgrade:run') if feature(:satellite)
+      execute!('foreman-rake upgrade:run')
     end
   end
 end

data/definitions/procedures/packages/update.rb

@@ -6,14 +6,12 @@ module Procedures::Packages
       param :force, 'Do not skip if package is installed', :flag => true, :default => false
       param :warn_on_errors, 'Do not interrupt scenario on failure',
             :flag => true, :default => false
-      param :yum_options, 'Extra yum options if any', :array => true, :default => []
     end
 
     def run
       assumeyes_val = @assumeyes.nil? ? assumeyes? : @assumeyes
       package_manager.clean_cache(:assumeyes => assumeyes_val)
-      opts = { :assumeyes => assumeyes_val, :yum_options => @yum_options }
-      packages_action(:update, @packages, opts)
+      packages_action(:update, @packages, :assumeyes => assumeyes_val)
     rescue ForemanMaintain::Error::ExecutionError => e
       if @warn_on_errors
         set_status(:warning, e.message)

data/definitions/procedures/pulp/remove.rb

@@ -23,15 +23,7 @@ module Procedures::Pulp
         '/var/lib/pulp/uploads',
         '/var/lib/mongodb/',
         '/var/cache/pulp'
-      ].select { |dir| File.directory?(dir) }
-    end
-
-    def pulp_data_dirs_mountpoints
-      pulp_data_dirs.select { |d| Pathname(d).mountpoint? }
-    end
-
-    def deletable_pulp_dirs
-      @deletable_pulp_dirs ||= pulp_data_dirs - pulp_data_dirs_mountpoints
+      ]
     end
 
     # rubocop:disable  Metrics/MethodLength
@@ -60,12 +52,11 @@ module Procedures::Pulp
       @installed_pulp_packages
     end
 
-    def data_dir_removal_cmds(pulp_dirs)
-      pulp_dirs.map { |dir| "rm -rf #{dir}" }
+    def data_dir_removal_cmds
+      pulp_data_dirs.select { |dir| File.directory?(dir) }.map { |dir| "rm -rf #{dir}" }
     end
 
-    def ask_to_proceed
-      rm_cmds = data_dir_removal_cmds(pulp_data_dirs)
+    def ask_to_proceed(rm_cmds)
       question = "\nWARNING: All pulp2 packages will be removed with the following commands:\n"
       question += "\n# rpm -e #{pulp_packages.join('  ')}" if pulp_packages.any?
       question += "\n# yum remove rh-mongodb34-*"
@@ -78,9 +69,11 @@ module Procedures::Pulp
     end
 
     def run
+      rm_cmds = data_dir_removal_cmds
+
       assumeyes_val = @assumeyes.nil? ? assumeyes? : @assumeyes
 
-      ask_to_proceed unless assumeyes_val
+      ask_to_proceed(rm_cmds) unless assumeyes_val
 
       remove_pulp if pulp_packages.any?
 
@@ -92,9 +85,7 @@ module Procedures::Pulp
 
       drop_migrations
 
-      delete_pulp_data
-
-      restart_pulpcore_services
+      delete_pulp_data(rm_cmds) if rm_cmds.any?
     end
 
     def remove_pulp
@@ -169,51 +160,12 @@ module Procedures::Pulp
     end
     # rubocop:enable Metrics/BlockLength
 
-    def delete_pulp_data
-      non_mountpoints = data_dir_removal_cmds(deletable_pulp_dirs)
-      mountpoints = pulp_data_dirs_mountpoints
-      with_spinner('') do |spinner|
-        if non_mountpoints.any?
-          spinner.update('Deleting pulp2 data directories.')
-          non_mountpoints.each do |cmd|
-            execute!(cmd)
-          end
-          msg_for_del_non_mountpoints(mountpoints, spinner)
-        end
-        if mountpoints.any?
-          msg_for_del_mountpoints(mountpoints, spinner)
+    def delete_pulp_data(rm_cmds)
+      with_spinner('Deleting pulp2 data directories') do |spinner|
+        rm_cmds.each do |cmd|
+          execute!(cmd)
         end
-      end
-    end
-
-    def msg_for_del_non_mountpoints(mountpoints, spinner)
-      if mountpoints.empty?
-        spinner.update('Done deleting all pulp2 data directories.')
-      else
-        spinner.update("Deleted: #{deletable_pulp_dirs.join("\n")}")
-      end
-    end
-
-    def msg_for_del_mountpoints(mountpoints, spinner)
-      _, cmd_name = ForemanMaintain.pkg_and_cmd_name
-      if mountpoints.count > 1
-        spinner.update("The directories #{mountpoints.join(',')} are individual mountpoints.")
-        puts  "\nThe #{cmd_name} won't delete these directories.\n"\
-              'You need to remove content and these directories on your own.'
-      else
-        spinner.update("The directory #{mountpoints.join(',')} is individual mountpoint.")
-        puts  "\nThe #{cmd_name} won't delete the directory.\n"\
-              'You need to remove content and the directory on your own.'
-      end
-    end
-
-    def restart_pulpcore_services
-      with_spinner('Restarting pulpcore services') do |spinner|
-        pulp_services = feature(:pulpcore).services
-
-        feature(:service).handle_services(spinner, 'stop', :only => pulp_services)
-        feature(:service).handle_services(spinner, 'start', :only => pulp_services)
-        spinner.update('Done restarting pulpcore services')
+        spinner.update('Done deleting pulp2 data directories')
       end
     end
   end

data/definitions/procedures/repositories/setup.rb

@@ -2,10 +2,6 @@ module Procedures::Repositories
   class Setup < ForemanMaintain::Procedure
     metadata do
       description 'Setup repositories'
-      preparation_steps do
-        Procedures::Packages::Install.new(:packages => [ForemanMaintain::Utils::Facter.package])
-      end
-
       confine do
         feature(:instance).downstream || feature(:upstream)
       end

data/definitions/procedures/restore/configs.rb

@@ -56,7 +56,11 @@ module Procedures::Restore
     def reset_qpid_jrnls
       # on restore without pulp data qpid fails to start
       # https://access.redhat.com/solutions/4645231
-      execute('rm -rf /var/lib/qpidd/.qpidd/qls/dat2/__db.00*')
+      ['/var/lib/qpidd/.qpidd/', '/var/lib/qpidd/'].each do |qpidd_path|
+        if Dir.exist?("#{qpidd_path}/qls/dat2/")
+          execute("rm -rf #{qpidd_path}/qls/dat2/__db.00*")
+        end
+      end
     end
   end
 end

data/definitions/scenarios/restore.rb

@@ -18,6 +18,7 @@ module ForemanMaintain::Scenarios
       add_steps_with_context(Checks::Restore::ValidateBackup,
                              Procedures::Restore::Confirmation,
                              Checks::Restore::ValidateHostname,
+                             Checks::Restore::ValidateInterfaces,
                              Procedures::Selinux::SetFileSecurity,
                              Procedures::Restore::Configs)
       add_step_with_context(Procedures::Crond::Stop) if feature(:cron)
@@ -37,14 +38,11 @@ module ForemanMaintain::Scenarios
       end
       restore_mongo_dump(backup)
       add_steps_with_context(Procedures::Pulp::Migrate,
-                             Procedures::Pulpcore::Migrate,
-                             Procedures::Restore::CandlepinResetMigrations)
+                             Procedures::Pulpcore::Migrate)
 
       add_steps_with_context(Procedures::Restore::RegenerateQueues) if backup.online_backup?
       add_steps_with_context(Procedures::Service::Start,
                              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
@@ -90,6 +88,7 @@ module ForemanMaintain::Scenarios
       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::PgGlobalObjects => :backup_dir,

data/definitions/scenarios/upgrade_to_satellite_6_10.rb

@@ -25,7 +25,6 @@ module Scenarios::Satellite_6_10
     end
 
     def compose
-      add_step(Checks::Pulpcore::GroupOwnershipCheck)
       add_step(Checks::Puppet::WarnAboutPuppetRemoval)
       add_step(Checks::CheckForNewerPackages.new(:packages => [foreman_plugin_name('katello'),
                                                                'python3-pulp-2to3-migration'],
@@ -62,6 +61,13 @@ module Scenarios::Satellite_6_10
       context.map(:assumeyes, Procedures::Installer::Upgrade => :assumeyes)
     end
 
+    def check_var_lib_pulp
+      group_id = File.stat('/var/lib/pulp/').gid
+      if Etc.getgrgid(group_id).name != 'pulp'
+        raise "Please run 'foreman-maintain prep-6.10-upgrade' prior to upgrading."
+      end
+    end
+
     def pulp3_switchover_steps
       add_step(Procedures::Service::Enable.
           new(:only => Features::Pulpcore.pulpcore_migration_services))
@@ -73,6 +79,7 @@ module Scenarios::Satellite_6_10
     end
 
     def compose
+      check_var_lib_pulp
       unless check_min_version(foreman_plugin_name('katello'), '4.0')
         pulp3_switchover_steps
       end

data/lib/foreman_maintain/cli.rb

@@ -11,7 +11,6 @@ require 'foreman_maintain/cli/restore_command'
 require 'foreman_maintain/cli/maintenance_mode_command'
 require 'foreman_maintain/cli/packages_command'
 require 'foreman_maintain/cli/content_command'
-require 'foreman_maintain/cli/self_upgrade_command'
 
 module ForemanMaintain
   module Cli
@@ -26,7 +25,6 @@ module ForemanMaintain
       subcommand 'packages', 'Lock/Unlock package protection, install, update', PackagesCommand
       subcommand 'advanced', 'Advanced tools for server maintenance', AdvancedCommand
       subcommand 'content', 'Content related commands', ContentCommand
-      subcommand 'self-upgrade', 'Perform major version self upgrade', SelfUpgradeCommand
       subcommand 'maintenance-mode', 'Control maintenance-mode for application',
                  MaintenanceModeCommand
       if ForemanMaintain.detector.feature(:satellite) &&

data/lib/foreman_maintain/concerns/metadata.rb

@@ -100,10 +100,6 @@ module ForemanMaintain
           @data[:advanced_run] = advanced_run
         end
 
-        def do_not_whitelist
-          @data[:do_not_whitelist] = true
-        end
-
         def self.eval_dsl(metadata, &block)
           new(metadata).tap do |dsl|
             dsl.instance_eval(&block)

data/lib/foreman_maintain/concerns/os_facts.rb

@@ -0,0 +1,70 @@
+module ForemanMaintain
+  module Concerns
+    module OsFacts
+      OS_RELEASE_FILE = '/etc/os-release'.freeze
+      FALLBACK_OS_RELEASE_FILE = '/usr/lib/os-release'.freeze
+
+      def os_release_file
+        if File.file?(OS_RELEASE_FILE)
+          return OS_RELEASE_FILE
+        elsif File.file?(FALLBACK_OS_RELEASE_FILE)
+          return FALLBACK_OS_RELEASE_FILE
+        else
+          puts "The #{OS_RELEASE_FILE} and #{FALLBACK_OS_RELEASE_FILE} files are missing! "\
+               "Can't continue the execution without Operating System's facts!"
+          exit 1
+        end
+      end
+
+      def facts
+        unless defined?(@facts)
+          @facts = {}
+          regex = /^(["'])(.*)(\1)$/
+          File.open(os_release_file) do |file|
+            file.readlines.each do |line|
+              line.strip! # drop any whitespace, including newlines from start and end of the line
+              next if line.start_with?('#') # ignore comments
+              # split at most into 2 items, if the value ever contains an =
+              key, value = line.split('=', 2)
+              next unless key && value
+              @facts[key] = value.gsub(regex, '\2').delete('\\')
+            end
+          end
+        end
+        @facts
+      end
+
+      def os_version_id
+        facts.fetch('VERSION_ID')
+      end
+
+      def os_id
+        facts.fetch('ID')
+      end
+
+      def os_id_like_list
+        facts.fetch('ID_LIKE', '').split
+      end
+
+      def el?
+        File.exist?('/etc/redhat-release')
+      end
+
+      def debian?
+        File.exist?('/etc/debian_version')
+      end
+
+      def el7?
+        el_major_version == 7
+      end
+
+      def el8?
+        el_major_version == 8
+      end
+
+      def el_major_version
+        return os_version_id.to_i if el?
+      end
+    end
+  end
+end

data/lib/foreman_maintain/concerns/system_helpers.rb

@@ -8,6 +8,7 @@ module ForemanMaintain
     module SystemHelpers
       include Logger
       include Concerns::Finders
+      include ForemanMaintain::Concerns::OsFacts
 
       def self.included(klass)
         klass.extend(self)
@@ -99,13 +100,12 @@ module ForemanMaintain
       end
 
       def packages_action(action, packages, options = {})
-        options.validate_options!(:assumeyes, :yum_options)
+        options.validate_options!(:assumeyes)
         case action
         when :install
           package_manager.install(packages, :assumeyes => options[:assumeyes])
         when :update
-          package_manager.update(packages, :assumeyes => options[:assumeyes],
-                                           :yum_options => options[:yum_options])
+          package_manager.update(packages, :assumeyes => options[:assumeyes])
         when :remove
           package_manager.remove(packages, :assumeyes => options[:assumeyes])
         else
@@ -185,38 +185,13 @@ module ForemanMaintain
         ForemanMaintain.package_manager
       end
 
-      def os_facts
-        facter = ForemanMaintain::Utils::Facter.path
-        @os_facts ||= JSON.parse(execute("#{facter} -j os"))
-      end
-
-      def el?
-        os_facts['os']['family'] == 'RedHat'
-      end
-
-      def debian?
-        os_facts['os']['family'] == 'Debian'
-      end
-
-      def el7?
-        os_facts['os']['release']['major'] == '7' && el?
-      end
-
-      def el8?
-        os_facts['os']['release']['major'] == '8' && el?
-      end
-
-      def el_major_version
-        return os_facts['os']['release']['major'] if el?
-      end
-
       def ruby_prefix(scl = true)
-        if el7? && scl
+        if debian?
+          'ruby-'
+        elsif el7? && scl
           'tfm-rubygem-'
-        elsif el7? || el8?
+        else
           'rubygem-'
-        elsif debian?
-          'ruby-'
         end
       end
 

data/lib/foreman_maintain/package_manager/yum.rb

@@ -53,8 +53,8 @@ module ForemanMaintain::PackageManager
       yum_action('remove', packages, :assumeyes => assumeyes)
     end
 
-    def update(packages = [], assumeyes: false, yum_options: [])
-      yum_action('update', packages, :assumeyes => assumeyes, :yum_options => yum_options)
+    def update(packages = [], assumeyes: false)
+      yum_action('update', packages, :assumeyes => assumeyes)
     end
 
     def clean_cache(assumeyes: false)
@@ -114,12 +114,8 @@ module ForemanMaintain::PackageManager
       File.open(protector_config_file, 'w') { |file| file.puts config }
     end
 
-    # rubocop:disable Metrics/AbcSize, Metrics/MethodLength
-    def yum_action(action, packages, options)
-      with_status = options.fetch(:with_status, false)
-      assumeyes = options.fetch(:assumeyes, false)
-      valid_exit_statuses = options.fetch(:valid_exit_statuses, [0])
-      yum_options = options.fetch(:yum_options, [])
+    def yum_action(action, packages, with_status: false, assumeyes: false, valid_exit_statuses: [0])
+      yum_options = []
       packages = [packages].flatten(1)
       yum_options << '-y' if assumeyes
       yum_options << '--disableplugin=foreman-protector'

data/lib/foreman_maintain/reporter/cli_reporter.rb

@@ -317,11 +317,7 @@ module ForemanMaintain
 
         steps_with_error = scenario.steps_with_error(:whitelisted => false)
         steps_with_skipped = scenario.steps_with_skipped(:whitelisted => true)
-        not_skippable_steps = scenario.steps_with_error.select do |step|
-          step.metadata[:do_not_whitelist] == true
-        end
-
-        steps_to_whitelist = steps_with_error + steps_with_skipped - not_skippable_steps
+        steps_to_whitelist = steps_with_error + steps_with_skipped
         unless steps_with_error.empty?
           message << format(<<-MESSAGE.strip_heredoc, format_steps(steps_with_error, "\n", 2))
           The following steps ended up in failing state:
@@ -329,25 +325,11 @@ module ForemanMaintain
           %s
           MESSAGE
           whitelist_labels = steps_to_whitelist.map(&:label_dashed).join(',')
-          unless whitelist_labels.empty?
-            recommend << if scenario.detector.feature(:instance).downstream
-                           format(<<-MESSAGE.strip_heredoc, whitelist_labels)
-              Resolve the failed steps and rerun the command.
-
-              If the situation persists and, you are unclear what to do next,
-              contact Red Hat Technical Support.
-
-              In case the failures are false positives, use
-              --whitelist="%s"
-              MESSAGE
-                         else
-                           format(<<-MESSAGE.strip_heredoc, whitelist_labels)
-              Resolve the failed steps and rerun the command.
-              In case the failures are false positives, use
-              --whitelist="%s"
-              MESSAGE
-                         end
-          end
+          recommend << format(<<-MESSAGE.strip_heredoc, whitelist_labels)
+          Resolve the failed steps and rerun
+          the command. In case the failures are false positives,
+          use --whitelist="%s"
+          MESSAGE
         end
 
         steps_with_warning = scenario.steps_with_warning(:whitelisted => false)

data/lib/foreman_maintain/utils/backup.rb

@@ -267,21 +267,46 @@ module ForemanMaintain
 
       def validate_hostname?
         # make sure that the system hostname is the same as the backup
-        config_tarball = file_map[:config_files][:path]
-        tar_cmd = "tar zxf #{config_tarball} etc/httpd/conf/httpd.conf --to-stdout --occurrence=1"
-        status, httpd_config = execute_with_status(tar_cmd)
-
-        # Incremental backups sometimes don't include httpd.conf. Since a "base" backup
-        # is restored before an incremental, we can assume that the hostname is checked
-        # during the base backup restore
-        if status == 0
-          match = httpd_config.match(/\s*ServerName\s+"*([^ "]+)"*\s*$/)
-          match ? match[1] == hostname : false
+        hostname_from_metadata = metadata.fetch('hostname', nil)
+        if hostname_from_metadata
+          hostname_from_metadata == hostname
         else
-          true
+          config_tarball = file_map[:config_files][:path]
+          tar_cmd = "tar zxf #{config_tarball} etc/httpd/conf/httpd.conf --to-stdout --occurrence=1"
+          status, httpd_config = execute_with_status(tar_cmd)
+
+          # Incremental backups sometimes don't include httpd.conf. Since a "base" backup
+          # is restored before an incremental, we can assume that the hostname is checked
+          # during the base backup restore
+          if status == 0
+            match = httpd_config.match(/\s*ServerName\s+"*([^ "]+)"*\s*$/)
+            match ? match[1] == hostname : false
+          else
+            true
+          end
         end
       end
 
+      def validate_interfaces
+        # I wanted to do `Socket.getifaddrs.map(&:name).uniq`,
+        # but this has to work with Ruby 2.0, and Socket.getifaddrs is 2.1+
+        errors = {}
+        system_interfaces = Dir.children('/sys/class/net')
+
+        proxy_config = metadata.fetch('proxy_config', {})
+
+        %w[dns dhcp].each do |feature|
+          next unless proxy_config.fetch(feature, false)
+
+          wanted_interface = proxy_config.fetch("#{feature}_interface", 'lo')
+          unless system_interfaces.include?(wanted_interface)
+            errors[feature] = { 'configured' => wanted_interface, 'available' => system_interfaces }
+          end
+        end
+
+        return errors
+      end
+
       def metadata
         if file_map[:metadata][:present]
           YAML.load_file(file_map[:metadata][:path])

data/lib/foreman_maintain/utils/command_runner.rb

@@ -66,8 +66,7 @@ module ForemanMaintain
         log_file = Tempfile.open('captured-output')
         exit_file = Tempfile.open('captured-exit-code')
         Kernel.system(
-          "stdbuf -oL -eL bash -c '#{full_command}; echo $? > #{exit_file.path}'"\
-          "| tee -i #{log_file.path}"
+          "bash -c '#{full_command}; echo $? > #{exit_file.path}' | tee -i #{log_file.path}"
         )
         File.open(log_file.path) { |f| @output = f.read }
         File.open(exit_file.path) do |f|

data/lib/foreman_maintain/utils.rb

@@ -7,4 +7,3 @@ require 'foreman_maintain/utils/curl_response'
 require 'foreman_maintain/utils/mongo_core'
 require 'foreman_maintain/utils/service'
 require 'foreman_maintain/utils/system_helpers'
-require 'foreman_maintain/utils/facter'

data/lib/foreman_maintain/version.rb

@@ -1,3 +1,3 @@
 module ForemanMaintain
-  VERSION = '0.8.31'.freeze
+  VERSION = '0.9.1'.freeze
 end

data/lib/foreman_maintain.rb

@@ -15,6 +15,7 @@ module ForemanMaintain
   require 'foreman_maintain/concerns/finders'
   require 'foreman_maintain/concerns/metadata'
   require 'foreman_maintain/concerns/scenario_metadata'
+  require 'foreman_maintain/concerns/os_facts'
   require 'foreman_maintain/concerns/system_helpers'
   require 'foreman_maintain/concerns/system_service'
   require 'foreman_maintain/concerns/hammer'

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: foreman_maintain
 version: !ruby/object:Gem::Version
-  version: 0.8.31
+  version: 0.9.1
 platform: ruby
 authors:
 - Ivan Nečas
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2022-06-07 00:00:00.000000000 Z
+date: 2021-10-20 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: clamp
@@ -84,16 +84,30 @@ dependencies:
   name: rake
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "<"
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+- !ruby/object:Gem::Dependency
+  name: rubocop
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - '='
       - !ruby/object:Gem::Version
-        version: 11.0.0
+        version: 0.50.0
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "<"
+    - - '='
       - !ruby/object:Gem::Version
-        version: 11.0.0
+        version: 0.50.0
 description: Provides various features that helps keeping the Foreman/Satellite up
   and running.
 email: inecas@redhat.com
@@ -154,7 +168,6 @@ files:
 - definitions/checks/original_assets.rb
 - definitions/checks/package_manager/yum/validate_yum_config.rb
 - definitions/checks/pulpcore/db_up.rb
-- definitions/checks/pulpcore/group_ownership_check.rb
 - definitions/checks/puppet/provide_upgrade_guide.rb
 - definitions/checks/puppet/verify_no_empty_cacert_requests.rb
 - definitions/checks/puppet/warn_about_puppet_removal.rb
@@ -164,6 +177,7 @@ files:
 - definitions/checks/repositories/validate.rb
 - definitions/checks/restore/validate_backup.rb
 - definitions/checks/restore/validate_hostname.rb
+- definitions/checks/restore/validate_interfaces.rb
 - definitions/checks/root_user.rb
 - definitions/checks/server_ping.rb
 - definitions/checks/services_up.rb
@@ -274,12 +288,9 @@ files:
 - definitions/procedures/puppet/delete_empty_ca_cert_request_files.rb
 - definitions/procedures/refresh_features.rb
 - definitions/procedures/remote_execution/remove_existing_settingsd.rb
-- definitions/procedures/repositories/backup_enabled_repos.rb
 - definitions/procedures/repositories/disable.rb
-- definitions/procedures/repositories/enable.rb
 - definitions/procedures/repositories/setup.rb
 - definitions/procedures/restore/candlepin_dump.rb
-- definitions/procedures/restore/candlepin_reset_migrations.rb
 - definitions/procedures/restore/configs.rb
 - definitions/procedures/restore/confirmation.rb
 - definitions/procedures/restore/drop_databases.rb
@@ -310,7 +321,6 @@ files:
 - definitions/scenarios/packages.rb
 - definitions/scenarios/prep_6_10_upgrade.rb
 - definitions/scenarios/restore.rb
-- definitions/scenarios/self_upgrade.rb
 - definitions/scenarios/services.rb
 - definitions/scenarios/upgrade_to_capsule_6_10.rb
 - definitions/scenarios/upgrade_to_capsule_6_10_z.rb
@@ -358,7 +368,6 @@ files:
 - lib/foreman_maintain/cli/maintenance_mode_command.rb
 - lib/foreman_maintain/cli/packages_command.rb
 - lib/foreman_maintain/cli/restore_command.rb
-- lib/foreman_maintain/cli/self_upgrade_command.rb
 - lib/foreman_maintain/cli/service_command.rb
 - lib/foreman_maintain/cli/transform_clamp_options.rb
 - lib/foreman_maintain/cli/upgrade_command.rb
@@ -369,6 +378,7 @@ files:
 - lib/foreman_maintain/concerns/hammer.rb
 - lib/foreman_maintain/concerns/logger.rb
 - lib/foreman_maintain/concerns/metadata.rb
+- lib/foreman_maintain/concerns/os_facts.rb
 - lib/foreman_maintain/concerns/primary_checks.rb
 - lib/foreman_maintain/concerns/pulp_common.rb
 - lib/foreman_maintain/concerns/reporter.rb
@@ -408,7 +418,6 @@ files:
 - lib/foreman_maintain/utils/disk/io_device.rb
 - lib/foreman_maintain/utils/disk/nil_device.rb
 - lib/foreman_maintain/utils/disk/stats.rb
-- lib/foreman_maintain/utils/facter.rb
 - lib/foreman_maintain/utils/hash_tools.rb
 - lib/foreman_maintain/utils/mongo_core.rb
 - lib/foreman_maintain/utils/response.rb

data/definitions/checks/pulpcore/group_ownership_check.rb

@@ -1,18 +0,0 @@
-module Checks
-  module Pulpcore
-    class GroupOwnershipCheck < ForemanMaintain::Check
-      metadata do
-        description 'Check the group owner of /var/lib/pulp directory'
-        label :group_ownership_check_of_pulp_content
-        manual_detection
-      end
-
-      def run
-        group_id = File.stat('/var/lib/pulp/').gid
-        if Etc.getgrgid(group_id).name != 'pulp'
-          fail! "Please run 'foreman-maintain prep-6.10-upgrade' prior to upgrading."
-        end
-      end
-    end
-  end
-end

data/definitions/procedures/repositories/backup_enabled_repos.rb

@@ -1,16 +0,0 @@
-module Procedures::Repositories
-  class BackupEnabledRepos < ForemanMaintain::Procedure
-    metadata do
-      label :backup_enabled_repos
-      description 'Stores enabled repositories in yaml file'
-    end
-
-    def run
-      enabled_repos_ids = feature(:system_repos).enabled_repos_ids
-      unless enabled_repos_ids.empty?
-        backup_dir = File.expand_path(ForemanMaintain.config.backup_dir)
-        File.write(File.join(backup_dir, 'enabled_repos.yml'), enabled_repos_ids.to_yaml)
-      end
-    end
-  end
-end

data/definitions/procedures/repositories/enable.rb

@@ -1,13 +0,0 @@
-module Procedures::Repositories
-  class Enable < ForemanMaintain::Procedure
-    metadata do
-      param :repos, 'List of repositories to enable'
-      description 'Enable repositories'
-    end
-    def run
-      with_spinner('Enabling repositories') do
-        feature(:system_repos).enable_repos(@repos)
-      end
-    end
-  end
-end

data/definitions/procedures/restore/candlepin_reset_migrations.rb

@@ -1,14 +0,0 @@
-module Procedures::Restore
-  class CandlepinResetMigrations < ForemanMaintain::Procedure
-    metadata do
-      description 'Ensure Candlepin runs all migrations after restoring the database'
-      confine do
-        feature(:candlepin_database)
-      end
-    end
-
-    def run
-      FileUtils.rm_f('/var/lib/candlepin/.puppet-candlepin-rpm-version')
-    end
-  end
-end

data/definitions/scenarios/self_upgrade.rb

@@ -1,73 +0,0 @@
-module ForemanMaintain::Scenarios
-  class SelfUpgradeBase < ForemanMaintain::Scenario
-    include ForemanMaintain::Concerns::Downstream
-    def 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 maintenance_repo_label
-        return maintenance_repo_label
-      elsif (repo = ENV['MAINTENANCE_REPO_LABEL'])
-        return repo unless repo.empty?
-      end
-
-      maintenance_repo(version)
-    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
-    end
-
-    def use_rhsm?
-      return false if maintenance_repo_label
-
-      if (repo = ENV['MAINTENANCE_REPO_LABEL'])
-        return false unless repo.empty?
-      end
-
-      true
-    end
-
-    def req_repos_to_update_pkgs
-      if use_rhsm?
-        main_rh_repos + [maintenance_repo_id(target_version)]
-      else
-        [maintenance_repo_id(target_version)]
-      end
-    end
-  end
-
-  class SelfUpgrade < SelfUpgradeBase
-    metadata do
-      label :self_upgrade_foreman_maintain
-      description "Enables the specified version's maintenance repository and,"\
-  								"\nupdates the satellite-maintain packages"
-      manual_detection
-    end
-
-    def compose
-      if check_min_version('foreman', '2.5') || check_min_version('foreman-proxy', '2.5')
-        pkgs_to_update = %w[satellite-maintain rubygem-foreman_maintain]
-        yum_options = req_repos_to_update_pkgs.map do |id|
-          "--enablerepo=#{id}"
-        end
-        add_step(Procedures::Packages::Update.new(packages: pkgs_to_update, assumeyes: true,
-                                                  yum_options: yum_options))
-      end
-    end
-  end
-end

data/lib/foreman_maintain/cli/self_upgrade_command.rb

@@ -1,18 +0,0 @@
-module ForemanMaintain
-  module Cli
-    class SelfUpgradeCommand < Base
-      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
-        run_scenario(upgrade_scenario)
-      end
-
-      def upgrade_scenario
-        Scenarios::SelfUpgrade.new(
-          maintenance_repo_label: maintenance_repo_label
-        )
-      end
-    end
-  end
-end

data/lib/foreman_maintain/utils/facter.rb

@@ -1,17 +0,0 @@
-module ForemanMaintain::Utils
-  module Facter
-    include ForemanMaintain::Concerns::SystemHelpers
-
-    FACTER_FILES = %w[/usr/bin/facter /opt/puppetlabs/bin/facter].freeze
-
-    def self.package
-      puppet_version = version(execute!('/opt/puppetlabs/bin/puppet --version'))
-
-      puppet_version.major >= 4 ? 'puppet-agent' : 'facter'
-    end
-
-    def self.path
-      FACTER_FILES.find { |path| File.exist?(path) }
-    end
-  end
-end