foreman_maintain 1.4.0 → 1.4.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: a8e76b84acb5103032daf0a4207f4c53a7d425fffe2fbfce49273200e3f5a732
-  data.tar.gz: a91160e10024846b1b931515e55c6461aba0c2c3b5209a966fb9c43685b3eea5
+  metadata.gz: 4d37937d8bc4cbf619ea0e654e6826ae92a96ecd74f1b260e5b402df7bcbdc68
+  data.tar.gz: a0fcf7a0f6802f7547c26d640650ac29cafa3568f7fdbc648f31d3dbdbcf6a72
 SHA512:
-  metadata.gz: 005d201ea441c1e1ecdd51838f76f9157357a332cb025ba6ea9fe835bff604d601b259ca374d8cf32118ab12203bea2dfc490d959127dee1f92768a684fb0e0f
-  data.tar.gz: f51b31aa841554becdf0e3904c1a9d5259bd0d7691a83240b99f731320335ad20ee5428fc5c02267bf41ec50bd4f0e87bce2e7fcb9cec0f068ea4c03b04e1cac
+  metadata.gz: 2bab8216e974e96128a5f0fb88a201d1c8dd9da13d71b89efea76337c242f6459285e8af8a8dbcacbaa318f402c1b26cc7056e5e1d976946b8939f13bbaa4fda
+  data.tar.gz: 59772c9b2ec381408458383f4e06bafb8bb3998f5c4cea60be7a2dc2a254803896a05aa2858aad48f34e54185b7db6a455534cafa5f671b6a52a69bbe0b07e74

data/README.md

@@ -1,4 +1,4 @@
-# Foreman Maintain [![Build Status](https://github.com/theforeman/foreman_maintain/workflows/Ruby%20Tests/badge.svg?event=pull_request)](https://github.com/theforeman/foreman_maintain/workflows/Ruby%20Tests/badge.svg?event=pull_request) <a href="https://codeclimate.com/github/theforeman/foreman_maintain"><img src="https://codeclimate.com/github/theforeman/foreman_maintain/badges/gpa.svg" /></a>
+# Foreman Maintain [![Ruby Tests](https://github.com/theforeman/foreman_maintain/actions/workflows/ruby_tests.yml/badge.svg)](https://github.com/theforeman/foreman_maintain/actions/workflows/ruby_tests.yml) <a href="https://codeclimate.com/github/theforeman/foreman_maintain"><img src="https://codeclimate.com/github/theforeman/foreman_maintain/badges/gpa.svg" /></a>
 
 The `foreman_maintain` aims to provide various features that helps keep the
 Foreman/Satellite up and running. It supports multiple versions and subparts

data/definitions/checks/check_hotfix_installed.rb

@@ -4,8 +4,7 @@ class Checks::CheckHotfixInstalled < ForemanMaintain::Check
     description 'Check to verify if any hotfix installed on system'
     tags :pre_upgrade
     preparation_steps do
-      [Checks::Repositories::CheckNonRhRepository.new,
-       Procedures::Packages::Install.new(:packages => %w[yum-utils])]
+      [Checks::Repositories::CheckNonRhRepository.new]
     end
 
     confine do
@@ -45,7 +44,7 @@ class Checks::CheckHotfixInstalled < ForemanMaintain::Check
 
   def installed_packages
     packages = []
-    IO.popen(['repoquery', '-a', '--installed', '--qf', query_format]) do |io|
+    IO.popen(['dnf', 'repoquery', '-a', '--installed', '--qf', query_format]) do |io|
       io.each do |line|
         repo, pkg = line.chomp.split
         next if repo.nil? || pkg.nil?

data/definitions/checks/disk/performance.rb

@@ -30,8 +30,7 @@ module Checks
           puts "\n"
           puts stats.stdout
 
-          current_downstream_feature = feature(:instance).downstream
-          if current_downstream_feature&.at_least_version?('6.3')
+          if feature(:instance).downstream
             assert(success, io_obj.slow_disk_error_msg + warning_message, :warn => true)
           else
             assert(success, io_obj.slow_disk_error_msg)

data/definitions/checks/package_manager/{yum/validate_yum_config.rb → dnf/validate_dnf_config.rb}

@@ -1,9 +1,9 @@
 module Checks::PackageManager
-  module Yum
-    class ValidateYumConfig < ForemanMaintain::Check
+  module Dnf
+    class ValidateDnfConfig < ForemanMaintain::Check
       metadata do
-        label :validate_yum_config
-        description 'Check to validate yum configuration before upgrade'
+        label :validate_dnf_config
+        description 'Check to validate dnf configuration before upgrade'
         tags :pre_upgrade
       end
 
@@ -17,30 +17,32 @@ module Checks::PackageManager
 
       private
 
+      # rubocop:disable Metrics/LineLength
       def failure_message(final_result)
         verb_string = final_result[:matched_keys].length > 1 ? 'are' : 'is'
 
-        "#{final_result[:matched_keys].join(',')} #{verb_string} set in /etc/yum.conf as below:"\
+        "#{final_result[:matched_keys].join(',')} #{verb_string} set in /etc/dnf/dnf.conf as below:"\
         "\n#{final_result[:grep_output]}"\
-        "\nUnset this configuration as it is risky while yum update or upgrade!"
+        "\nUnset this configuration as it is risky while dnf update or upgrade!"
       end
+      # rubocop:enable Metrics/LineLength
 
       def verify_config_options
         result = {}
-        combined_regex = yum_config_options.values.join('|')
+        combined_regex = dnf_config_options.values.join('|')
         result[:grep_output] = execute_grep_cmd(combined_regex)
-        result[:matched_keys] = yum_config_options.keys.select do |key|
+        result[:matched_keys] = dnf_config_options.keys.select do |key|
           result[:grep_output].include?(key)
         end
         result
       end
 
       def execute_grep_cmd(regex_string)
-        execute_with_status("grep -iE '#{regex_string}' /etc/yum.conf")[1]
+        execute_with_status("grep -iE '#{regex_string}' /etc/dnf/dnf.conf")[1]
       end
 
-      def yum_config_options
-        @yum_config_options ||= {
+      def dnf_config_options
+        @dnf_config_options ||= {
           'exclude' => '^exclude\s*=\s*\S+.*$',
         }
       end

data/definitions/checks/repositories/check_upstream_repository.rb

@@ -6,8 +6,7 @@ class Checks::CheckUpstreamRepository < ForemanMaintain::Check
     description 'Check if any upstream repositories are enabled on system'
     tags :pre_upgrade
     preparation_steps do
-      [Checks::Repositories::CheckNonRhRepository.new,
-       Procedures::Packages::Install.new(:packages => %w[yum-utils])]
+      [Checks::Repositories::CheckNonRhRepository.new]
     end
     confine do
       feature(:instance).downstream

data/definitions/features/installer.rb

@@ -3,22 +3,10 @@ class Features::Installer < ForemanMaintain::Feature
     label :installer
 
     confine do
-      find_package('foreman-installer') ||
-        find_package('katello-installer') ||
-        find_package('capsule-installer')
+      find_package('foreman-installer')
     end
   end
 
-  def initialize
-    @installer_type = if find_package('foreman-installer')
-                        :scenarios
-                      elsif find_package('katello-installer')
-                        :legacy_katello
-                      elsif find_package('capsule-installer')
-                        :legacy_capsule
-                      end
-  end
-
   def answers
     load_answers(configuration)
   end
@@ -28,39 +16,17 @@ class Features::Installer < ForemanMaintain::Feature
   end
 
   def config_file
-    case @installer_type
-    when :scenarios
-      last_scenario_config
-    when :legacy_katello
-      File.join(config_directory, 'katello-installer.yaml')
-    when :legacy_capsule
-      File.join(config_directory, 'capsule-installer.yaml')
-    end
-  end
-
-  def with_scenarios?
-    @installer_type == :scenarios
+    last_scenario_config
   end
 
   def config_directory
-    case @installer_type
-    when :scenarios
-      '/etc/foreman-installer'
-    when :legacy_katello
-      '/etc/katello-installer'
-    when :legacy_capsule
-      '/etc/capsule-installer'
-    end
+    '/etc/foreman-installer'
   end
 
   def custom_hiera_file
     @custom_hiera_file ||= File.join(config_directory, 'custom-hiera.yaml')
   end
 
-  def can_upgrade?
-    @installer_type == :scenarios || @installer_type == :legacy_katello
-  end
-
   def config_files
     Dir.glob(File.join(config_directory, '**/*')) +
       [
@@ -71,23 +37,14 @@ class Features::Installer < ForemanMaintain::Feature
   end
 
   def last_scenario
-    return nil unless with_scenarios?
-
     File.basename(last_scenario_config).split('.')[0]
   end
 
   def installer_command
-    case @installer_type
-    when :scenarios
-      if feature(:satellite)
-        'satellite-installer'
-      else
-        'foreman-installer'
-      end
-    when :legacy_katello
-      'katello-installer'
-    when :legacy_capsule
-      'capsule-installer'
+    if feature(:satellite)
+      'satellite-installer'
+    else
+      'foreman-installer'
     end
   end
 
@@ -105,22 +62,7 @@ class Features::Installer < ForemanMaintain::Feature
   end
 
   def upgrade(exec_options = {})
-    run(installer_arguments, exec_options)
-  end
-
-  def installer_arguments
-    installer_args = ''
-
-    if feature(:foreman_proxy)&.with_content? &&
-       check_max_version('foreman-installer', '3.4')
-      installer_args += ' --disable-system-checks'
-    end
-
-    if !check_min_version('foreman-installer', '2.1') && can_upgrade?
-      installer_args += ' --upgrade'
-    end
-
-    installer_args
+    run('', exec_options)
   end
 
   def initial_admin_username

data/definitions/features/instance.rb

@@ -139,12 +139,6 @@ class Features::Instance < ForemanMaintain::Feature
   end
 
   def pick_failing_components(components)
-    if feature(:katello).current_version < Gem::Version.new('3.2.0')
-      # Note that katello_ping returns an empty result against foreman_auth.
-      # https://github.com/Katello/katello/commit/95d7b9067d38f269a5ec121fb73b5c19d4422baf
-      components.reject! { |n| n.eql?('foreman_auth') }
-    end
-
     components.each_with_object([]) do |(name, data), failing|
       failing << name unless data['status'] == 'ok'
     end

data/definitions/procedures/backup/metadata.rb

@@ -64,9 +64,11 @@ module Procedures::Backup
     end
 
     def proxy_config(spinner)
-      spinner.update('Collecting proxy configuration')
-      feature(:installer).answers['foreman_proxy'].select do |key, _|
-        PROXY_CONFIG_ENTRIES.include?(key)
+      if feature(:installer)
+        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/backup/snapshot/snapshot_deprecation_message.rb

@@ -0,0 +1,14 @@
+module Procedures::Backup
+  module Snapshot
+    class SnapshotDeprecationMessage < ForemanMaintain::Procedure
+      metadata do
+        description 'Snapshot backups are deprecated'
+        tags :backup
+      end
+
+      def run
+        set_warn('Snapshot backups are deprecated and will be removed in a future version.')
+      end
+    end
+  end
+end

data/definitions/procedures/packages/check_for_reboot.rb

@@ -0,0 +1,16 @@
+module Procedures::Packages
+  class CheckForReboot < ForemanMaintain::Procedure
+    metadata do
+      description 'Check if system needs reboot'
+    end
+
+    def run
+      status, output = execute_with_status('dnf needs-restarting --reboothint')
+      if status == 1
+        set_status(:warning, output)
+      else
+        set_status(:success, output)
+      end
+    end
+  end
+end

data/definitions/procedures/packages/installer_confirmation.rb

@@ -6,7 +6,7 @@ module Procedures::Packages
 
     def run
       question = "\nWARNING: This script runs #{feature(:installer).installer_command} " \
-        "after the yum execution \n" \
+        "after the dnf execution \n" \
         "to ensure the #{feature(:instance).product_name} " \
         "is in a consistent state.\n" \
         "As a result some of your services may be restarted. \n\n" \

data/definitions/procedures/packages/update.rb

@@ -6,13 +6,13 @@ 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 => []
+      param :dnf_options, 'Extra dnf 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 }
+      opts = { :assumeyes => assumeyes_val, :dnf_options => @dnf_options }
       packages_action(:update, @packages, opts)
     rescue ForemanMaintain::Error::ExecutionError => e
       if @warn_on_errors
@@ -27,7 +27,7 @@ module Procedures::Packages
     end
 
     def description
-      if @yum_options.include?('--downloadonly')
+      if @dnf_options.include?('--downloadonly')
         "Download package(s) #{@packages.join(', ')}"
       else
         "Update package(s) #{@packages.join(', ')}"

data/definitions/scenarios/backup.rb

@@ -20,12 +20,13 @@ module ForemanMaintain::Scenarios
     end
 
     def compose
-      check_valid_startegy
+      check_valid_strategy
+      snapshot_deprecation_warning
       safety_confirmation
       accessibility_confirmation
       prepare_directory
       logical_volume_confirmation
-      add_step_with_context(Procedures::Backup::Metadata)
+      add_step_with_context(Procedures::Backup::Metadata, :online_backup => online_backup?)
 
       case strategy
       when :online
@@ -49,7 +50,6 @@ 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,
@@ -66,7 +66,6 @@ module ForemanMaintain::Scenarios
         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)
       context.map(:incremental_dir,
         Procedures::Backup::PrepareDirectory => :incremental_dir,
@@ -104,8 +103,6 @@ module ForemanMaintain::Scenarios
 
     def prepare_directory
       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
@@ -114,6 +111,12 @@ module ForemanMaintain::Scenarios
       end
     end
 
+    def snapshot_deprecation_warning
+      if strategy == :snapshot
+        add_step_with_context(Procedures::Backup::Snapshot::SnapshotDeprecationMessage)
+      end
+    end
+
     def accessibility_confirmation
       if [:offline, :snapshot].include?(strategy)
         add_step_with_context(Procedures::Backup::AccessibilityConfirmation)
@@ -126,7 +129,7 @@ module ForemanMaintain::Scenarios
       end
     end
 
-    def check_valid_startegy
+    def check_valid_strategy
       unless [:online, :offline, :snapshot].include? strategy
         raise ArgumentError, "Unsupported strategy '#{strategy}'"
       end
@@ -199,7 +202,6 @@ module ForemanMaintain::Scenarios
         Procedures::Backup::Online::ForemanDB,
         Procedures::Backup::Online::PulpcoreDB
       )
-      add_step_with_context(Procedures::Backup::Metadata, :online_backup => true)
     end
 
     def strategy

data/definitions/scenarios/puppet.rb

@@ -15,9 +15,6 @@ module ForemanMaintain::Scenarios
           add_step(Procedures::Puppet::RemovePuppet)
           add_step(Procedures::Puppet::RemovePuppetData) if context.get(:remove_data)
           add_step(Procedures::Service::Restart)
-          if server?
-            add_step(Procedures::Foreman::ApipieCache)
-          end
         end
       end
     end

data/definitions/scenarios/self_upgrade.rb

@@ -67,13 +67,11 @@ module ForemanMaintain::Scenarios
     def downstream_self_upgrade(pkgs_to_update)
       ForemanMaintain.enable_maintenance_module
 
-      if check_min_version('foreman', '2.5') || check_min_version('foreman-proxy', '2.5')
-        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))
+      dnf_options = req_repos_to_update_pkgs.map do |id|
+        "--enablerepo=#{id}"
       end
+      add_step(Procedures::Packages::Update.new(packages: pkgs_to_update, assumeyes: true,
+        dnf_options: dnf_options))
     end
 
     def upstream_self_upgrade(pkgs_to_update)

data/definitions/scenarios/upgrade_to_capsule_6_15.rb

@@ -27,7 +27,6 @@ module Scenarios::Capsule_6_15
     def compose
       add_steps(find_checks(:default))
       add_steps(find_checks(:pre_upgrade))
-      add_step(Checks::Foreman::CheckpointSegments)
       add_step(Checks::Repositories::Validate.new(:version => '6.15'))
     end
   end
@@ -58,7 +57,7 @@ module Scenarios::Capsule_6_15
       modules_to_enable = ["satellite-capsule:#{el_short_name}"]
       add_step(Procedures::Packages::EnableModules.new(:module_names => modules_to_enable))
       add_step(Procedures::Packages::Update.new(:assumeyes => true,
-        :yum_options => ['--downloadonly']))
+        :dnf_options => ['--downloadonly']))
       add_step(Procedures::Service::Stop.new)
       add_step(Procedures::Packages::Update.new(:assumeyes => true))
       add_step_with_context(Procedures::Installer::Upgrade)
@@ -88,6 +87,7 @@ module Scenarios::Capsule_6_15
     def compose
       add_steps(find_checks(:default))
       add_steps(find_checks(:post_upgrade))
+      add_step(Procedures::Packages::CheckForReboot)
     end
   end
 end

data/definitions/scenarios/upgrade_to_capsule_6_15_z.rb

@@ -27,7 +27,6 @@ module Scenarios::Capsule_6_15_z
     def compose
       add_steps(find_checks(:default))
       add_steps(find_checks(:pre_upgrade))
-      add_step(Checks::Foreman::CheckpointSegments)
       add_step(Checks::Repositories::Validate.new(:version => '6.15'))
     end
   end
@@ -58,7 +57,7 @@ module Scenarios::Capsule_6_15_z
       modules_to_enable = ["satellite-capsule:#{el_short_name}"]
       add_step(Procedures::Packages::EnableModules.new(:module_names => modules_to_enable))
       add_step(Procedures::Packages::Update.new(:assumeyes => true,
-        :yum_options => ['--downloadonly']))
+        :dnf_options => ['--downloadonly']))
       add_step(Procedures::Service::Stop.new)
       add_step(Procedures::Packages::Update.new(:assumeyes => true))
       add_step_with_context(Procedures::Installer::Upgrade)
@@ -88,6 +87,7 @@ module Scenarios::Capsule_6_15_z
     def compose
       add_steps(find_checks(:default))
       add_steps(find_checks(:post_upgrade))
+      add_step(Procedures::Packages::CheckForReboot)
     end
   end
 end

data/definitions/scenarios/upgrade_to_katello_nightly.rb

@@ -55,7 +55,7 @@ module Scenarios::Katello_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']))
+        :dnf_options => ['--downloadonly']))
       add_step(Procedures::Service::Stop.new)
       add_step(Procedures::Packages::Update.new(:assumeyes => true))
       add_step_with_context(Procedures::Installer::Upgrade)

data/definitions/scenarios/upgrade_to_satellite_6_15.rb

@@ -27,7 +27,6 @@ module Scenarios::Satellite_6_15
     def compose
       add_steps(find_checks(:default))
       add_steps(find_checks(:pre_upgrade))
-      add_step(Checks::Foreman::CheckpointSegments)
       add_step(Checks::Repositories::Validate.new(:version => '6.15'))
     end
   end
@@ -59,7 +58,7 @@ module Scenarios::Satellite_6_15
       modules_to_enable = ["satellite:#{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']))
+        :dnf_options => ['--downloadonly']))
       add_step(Procedures::Service::Stop.new)
       add_step(Procedures::Packages::Update.new(:assumeyes => true))
       add_step_with_context(Procedures::Installer::Upgrade)
@@ -90,6 +89,7 @@ module Scenarios::Satellite_6_15
     def compose
       add_steps(find_checks(:default))
       add_steps(find_checks(:post_upgrade))
+      add_step(Procedures::Packages::CheckForReboot)
     end
   end
 end

data/definitions/scenarios/upgrade_to_satellite_6_15_z.rb

@@ -27,7 +27,6 @@ module Scenarios::Satellite_6_15_z
     def compose
       add_steps(find_checks(:default))
       add_steps(find_checks(:pre_upgrade))
-      add_step(Checks::Foreman::CheckpointSegments)
       add_step(Checks::Repositories::Validate.new(:version => '6.15'))
     end
   end
@@ -58,7 +57,7 @@ module Scenarios::Satellite_6_15_z
       modules_to_enable = ["satellite:#{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']))
+        :dnf_options => ['--downloadonly']))
       add_step(Procedures::Service::Stop.new)
       add_step(Procedures::Packages::Update.new(:assumeyes => true))
       add_step_with_context(Procedures::Installer::Upgrade)
@@ -89,6 +88,7 @@ module Scenarios::Satellite_6_15_z
     def compose
       add_steps(find_checks(:default))
       add_steps(find_checks(:post_upgrade))
+      add_step(Procedures::Packages::CheckForReboot)
     end
   end
 end

data/extras/foreman_protector/foreman-protector.conf

@@ -1,3 +1,3 @@
 [main]
 enabled = 0
-whitelist = /etc/yum/pluginconf.d/foreman-protector.whitelist
+whitelist = /etc/dnf/plugins/foreman-protector.whitelist

data/extras/foreman_protector/foreman-protector.whitelist

@@ -39,5 +39,21 @@ python3-firewall
 python3-nftables
 python3-slip
 python3-slip-dbus
+# pcp
+pcp
+pcp-conf
+pcp-libs
+pcp-pmda-apache
+pcp-pmda-openmetrics
+pcp-pmda-postgresql
+pcp-pmda-redis
+pcp-system-tools
+python3-pcp
+grafana
+grafana-pcp
 # foreman-maintain
 rubygem-foreman_maintain
+# fapolicyd
+fapolicyd
+foreman-fapolicyd
+foreman-proxy-fapolicyd

data/lib/foreman_maintain/cli/backup_command.rb

@@ -155,7 +155,7 @@ module ForemanMaintain
     class BackupCommand < Base
       subcommand 'online', 'Keep services online during backup', OnlineBackupCommand
       subcommand 'offline', 'Shut down services to preserve consistent backup', OfflineBackupCommand
-      subcommand 'snapshot', 'Use snapshots of the databases to create backup', SnapshotBackupCommand
+      subcommand 'snapshot', 'Use snapshots of the databases to create backup (DEPRECATED)', SnapshotBackupCommand
     end
     # rubocop:enable Metrics/LineLength
   end

data/lib/foreman_maintain/concerns/base_database.rb

@@ -75,11 +75,6 @@ module ForemanMaintain
           :hidden_patterns => [config['password']])
       end
 
-      def backup_file_path(config = configuration)
-        dump_file_name = "#{config['database']}_#{Time.now.strftime('%Y-%m-%d_%H-%M-%S')}.dump"
-        "#{backup_dir}/#{dump_file_name}.bz2"
-      end
-
       def dump_db(file, config = configuration)
         execute!(dump_command(config) + " > #{file}", :hidden_patterns => [config['password']])
       end
@@ -115,47 +110,11 @@ module ForemanMaintain
         end
       end
 
-      # TODO: refactor to use dump_db
-      def backup_db_command(file_path, config = configuration)
-        pg_dump_cmd = "pg_dump -Fc #{config['database']}"
-        "runuser - postgres -c '#{pg_dump_cmd}' | bzip2 -9 > #{file_path}"
-      end
-
       # TODO: remove the backup file path tools from here. Lib Utils::Backup?
       def backup_dir
         @backup_dir ||= File.expand_path(ForemanMaintain.config.db_backup_dir)
       end
 
-      def perform_backup(config = configuration)
-        file_path = backup_file_path(config)
-        backup_cmd = backup_db_command(file_path, config)
-        execute!(backup_cmd, :hidden_patterns => [config['password']])
-        puts "\n Note: Database backup file path - #{file_path}"
-        puts "\n In case of any exception, use above dump file to restore DB."
-      end
-
-      def table_exist?(table_name)
-        sql = <<-SQL
-          SELECT EXISTS ( SELECT *
-          FROM information_schema.tables WHERE table_name =  '#{table_name}' )
-        SQL
-        result = query(sql)
-        return false if result.nil? || (result && result.empty?)
-
-        result.first['exists'].eql?('t')
-      end
-
-      def delete_records_by_ids(tbl_name, rec_ids)
-        quotize_rec_ids = rec_ids.map { |el| "'#{el}'" }.join(',')
-        unless quotize_rec_ids.empty?
-          psql(<<-SQL)
-            BEGIN;
-             DELETE FROM #{tbl_name} WHERE id IN (#{quotize_rec_ids});
-            COMMIT;
-          SQL
-        end
-      end
-
       def find_base_directory(directory)
         find_dir_containing_file(directory, 'postgresql.conf')
       end

data/lib/foreman_maintain/concerns/system_helpers.rb

@@ -100,13 +100,13 @@ module ForemanMaintain
       end
 
       def packages_action(action, packages, options = {})
-        options.validate_options!(:assumeyes, :yum_options)
+        options.validate_options!(:assumeyes, :dnf_options)
         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])
+                                           :dnf_options => options[:dnf_options])
         when :remove
           package_manager.remove(packages, :assumeyes => options[:assumeyes])
         else