foreman_maintain 1.3.5 → 1.4.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: d90e54ce37bbcb97b38d4362699d2e5fdec4bb6a9c73a6449cebc1c6a20cf970
-  data.tar.gz: 79ddf0919edb2fd587d06d414ade8b01994d197f61069dab8bb2d03c22ad72f3
+  metadata.gz: a742f6c45bf5c57c814ba78f83ff3fb72863de35005f0e8f34a6f823de766ba5
+  data.tar.gz: be8eb54fe3eb4d9a05d59f64ad34fc314ae97fc4be47c1aeaf4cde3b0d46b979
 SHA512:
-  metadata.gz: 11c9f890ad98bdac65ca98df002386f6c5435a67b2374e1349d7dc8f53cf79a3587f5ff6f449c0b1f5a7b1a24cb9e96254706c9b2eb9e257679cb1eead8b6831
-  data.tar.gz: d827ab0345f35720c3a1eaae0779593b56c6c577f8a72c0aacccc5210cc4d629f8f1a7c2f8afd5371dbdfb042fc2b79414f457d4d69afdbe203d196eb97d60d5
+  metadata.gz: 4cb48844ead00af99f66d37ee2a215fe9c397f14b544774580ad5df3dc09598231f5a8a7978fbc2111bb104daa951f1d3c6a1dc2426c2f635e319ded93117e6f
+  data.tar.gz: 7c0cea08c66ea928e2fa6659dd051d55c4ab0e9afabba61c18ad9934b1a21fd1b177d7f765e58a2885927103daf92ba8d05513d2fc0f386ec2900e546afa3cbc

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/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

@@ -25,7 +25,7 @@ module ForemanMaintain::Scenarios
       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 +49,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 +65,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 +102,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
@@ -199,7 +195,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/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_14_z.rb → upgrade_to_capsule_6_15.rb}

@@ -1,4 +1,4 @@
-module Scenarios::Capsule_6_14_z
+module Scenarios::Capsule_6_15
   class Abstract < ForemanMaintain::Scenario
     def self.upgrade_metadata(&block)
       metadata do
@@ -6,20 +6,20 @@ module Scenarios::Capsule_6_14_z
         confine do
           feature(:capsule) &&
             (feature(:capsule).current_minor_version == '6.14' || \
-              ForemanMaintain.upgrade_in_progress == '6.14.z')
+            ForemanMaintain.upgrade_in_progress == '6.15')
         end
         instance_eval(&block)
       end
     end
 
     def target_version
-      '6.14.z'
+      '6.15'
     end
   end
 
   class PreUpgradeCheck < Abstract
     upgrade_metadata do
-      description 'Checks before upgrading to Capsule 6.14.z'
+      description 'Checks before upgrading to Capsule 6.15'
       tags :pre_upgrade_checks
       run_strategy :fail_slow
     end
@@ -27,14 +27,13 @@ module Scenarios::Capsule_6_14_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.14'))
+      add_step(Checks::Repositories::Validate.new(:version => '6.15'))
     end
   end
 
   class PreMigrations < Abstract
     upgrade_metadata do
-      description 'Procedures before migrating to Capsule 6.14.z'
+      description 'Procedures before migrating to Capsule 6.15'
       tags :pre_migrations
     end
 
@@ -45,7 +44,7 @@ module Scenarios::Capsule_6_14_z
 
   class Migrations < Abstract
     upgrade_metadata do
-      description 'Migration scripts to Capsule 6.14.z'
+      description 'Migration scripts to Capsule 6.15'
       tags :migrations
     end
 
@@ -54,11 +53,11 @@ module Scenarios::Capsule_6_14_z
     end
 
     def compose
-      add_step(Procedures::Repositories::Setup.new(:version => '6.14'))
+      add_step(Procedures::Repositories::Setup.new(:version => '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)
@@ -67,7 +66,7 @@ module Scenarios::Capsule_6_14_z
 
   class PostMigrations < Abstract
     upgrade_metadata do
-      description 'Procedures after migrating to Capsule 6.14.z'
+      description 'Procedures after migrating to Capsule 6.15'
       tags :post_migrations
     end
 
@@ -80,7 +79,7 @@ module Scenarios::Capsule_6_14_z
 
   class PostUpgradeChecks < Abstract
     upgrade_metadata do
-      description 'Checks after upgrading to Capsule 6.14.z'
+      description 'Checks after upgrading to Capsule 6.15'
       tags :post_upgrade_checks
       run_strategy :fail_slow
     end

data/definitions/scenarios/{upgrade_to_capsule_6_14.rb → upgrade_to_capsule_6_15_z.rb}

@@ -1,25 +1,25 @@
-module Scenarios::Capsule_6_14
+module Scenarios::Capsule_6_15_z
   class Abstract < ForemanMaintain::Scenario
     def self.upgrade_metadata(&block)
       metadata do
         tags :upgrade_scenario
         confine do
           feature(:capsule) &&
-            (feature(:capsule).current_minor_version == '6.13' || \
-            ForemanMaintain.upgrade_in_progress == '6.14')
+            (feature(:capsule).current_minor_version == '6.15' || \
+              ForemanMaintain.upgrade_in_progress == '6.15.z')
         end
         instance_eval(&block)
       end
     end
 
     def target_version
-      '6.14'
+      '6.15.z'
     end
   end
 
   class PreUpgradeCheck < Abstract
     upgrade_metadata do
-      description 'Checks before upgrading to Capsule 6.14'
+      description 'Checks before upgrading to Capsule 6.15.z'
       tags :pre_upgrade_checks
       run_strategy :fail_slow
     end
@@ -27,14 +27,13 @@ module Scenarios::Capsule_6_14
     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.14'))
+      add_step(Checks::Repositories::Validate.new(:version => '6.15'))
     end
   end
 
   class PreMigrations < Abstract
     upgrade_metadata do
-      description 'Procedures before migrating to Capsule 6.14'
+      description 'Procedures before migrating to Capsule 6.15.z'
       tags :pre_migrations
     end
 
@@ -45,7 +44,7 @@ module Scenarios::Capsule_6_14
 
   class Migrations < Abstract
     upgrade_metadata do
-      description 'Migration scripts to Capsule 6.14'
+      description 'Migration scripts to Capsule 6.15.z'
       tags :migrations
     end
 
@@ -54,11 +53,11 @@ module Scenarios::Capsule_6_14
     end
 
     def compose
-      add_step(Procedures::Repositories::Setup.new(:version => '6.14'))
+      add_step(Procedures::Repositories::Setup.new(:version => '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)
@@ -67,7 +66,7 @@ module Scenarios::Capsule_6_14
 
   class PostMigrations < Abstract
     upgrade_metadata do
-      description 'Procedures after migrating to Capsule 6.14'
+      description 'Procedures after migrating to Capsule 6.15.z'
       tags :post_migrations
     end
 
@@ -80,7 +79,7 @@ module Scenarios::Capsule_6_14
 
   class PostUpgradeChecks < Abstract
     upgrade_metadata do
-      description 'Checks after upgrading to Capsule 6.14'
+      description 'Checks after upgrading to Capsule 6.15.z'
       tags :post_upgrade_checks
       run_strategy :fail_slow
     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_14_z.rb → upgrade_to_satellite_6_15.rb}

@@ -1,4 +1,4 @@
-module Scenarios::Satellite_6_14_z
+module Scenarios::Satellite_6_15
   class Abstract < ForemanMaintain::Scenario
     def self.upgrade_metadata(&block)
       metadata do
@@ -6,20 +6,20 @@ module Scenarios::Satellite_6_14_z
         confine do
           feature(:satellite) &&
             (feature(:satellite).current_minor_version == '6.14' || \
-            ForemanMaintain.upgrade_in_progress == '6.14.z')
+            ForemanMaintain.upgrade_in_progress == '6.15')
         end
         instance_eval(&block)
       end
     end
 
     def target_version
-      '6.14.z'
+      '6.15'
     end
   end
 
   class PreUpgradeCheck < Abstract
     upgrade_metadata do
-      description 'Checks before upgrading to Satellite 6.14.z'
+      description 'Checks before upgrading to Satellite 6.15'
       tags :pre_upgrade_checks
       run_strategy :fail_slow
     end
@@ -27,14 +27,13 @@ module Scenarios::Satellite_6_14_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.14'))
+      add_step(Checks::Repositories::Validate.new(:version => '6.15'))
     end
   end
 
   class PreMigrations < Abstract
     upgrade_metadata do
-      description 'Procedures before migrating to Satellite 6.14.z'
+      description 'Procedures before migrating to Satellite 6.15'
       tags :pre_migrations
     end
 
@@ -45,8 +44,9 @@ module Scenarios::Satellite_6_14_z
 
   class Migrations < Abstract
     upgrade_metadata do
-      description 'Migration scripts to Satellite 6.14.z'
+      description 'Migration scripts to Satellite 6.15'
       tags :migrations
+      run_strategy :fail_fast
     end
 
     def set_context_mapping
@@ -54,11 +54,11 @@ module Scenarios::Satellite_6_14_z
     end
 
     def compose
-      add_step(Procedures::Repositories::Setup.new(:version => '6.14'))
+      add_step(Procedures::Repositories::Setup.new(:version => '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)
@@ -68,7 +68,7 @@ module Scenarios::Satellite_6_14_z
 
   class PostMigrations < Abstract
     upgrade_metadata do
-      description 'Procedures after migrating to Satellite 6.14.z'
+      description 'Procedures after migrating to Satellite 6.15'
       tags :post_migrations
     end
 
@@ -81,7 +81,7 @@ module Scenarios::Satellite_6_14_z
 
   class PostUpgradeChecks < Abstract
     upgrade_metadata do
-      description 'Checks after upgrading to Satellite 6.14.z'
+      description 'Checks after upgrading to Satellite 6.15'
       tags :post_upgrade_checks
       run_strategy :fail_slow
     end