foreman_maintain 1.6.7 → 1.6.9

data/definitions/scenarios/self_upgrade.rb

@@ -4,11 +4,11 @@ module ForemanMaintain::Scenarios
     include ForemanMaintain::Concerns::Versions
 
     def target_version
-      @target_version ||= Gem::Version.new(current_version).bump.to_s
+      feature(:instance).target_version
     end
 
     def current_version
-      feature(:instance).downstream.current_version.to_s[/^\d+\.\d+\.\d+/]
+      feature(:instance).current_version
     end
 
     def maintenance_repo_label
@@ -47,12 +47,11 @@ module ForemanMaintain::Scenarios
       end
     end
 
-    def upstream_target_version
-      if feature(:katello_install)
-        return foreman_version_by_katello(target_version)
-      else
-        target_version
-      end
+    def self_upgrade_allowed?
+      target = Gem::Version.new(target_version).version
+
+      Gem::Version.new(current_version).segments[0..1].join('.') == target ||
+        Gem::Version.new(current_version).bump.segments[0..1].join('.') == target
     end
   end
 
@@ -65,13 +64,20 @@ module ForemanMaintain::Scenarios
     end
 
     def downstream_self_upgrade(pkgs_to_update)
+      unless self_upgrade_allowed?
+        raise(
+          ForemanMaintain::Error::Warn,
+          "foreman-maintain is too many versions ahead. The target " \
+          "version is #{target_version} while the currently installed " \
+          "version is #{current_version}. Please rollback " \
+          "foreman-maintain to the proper version."
+        )
+      end
+
       ForemanMaintain.enable_maintenance_module
 
-      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))
+        enabled_repos: req_repos_to_update_pkgs))
     end
 
     def upstream_self_upgrade(pkgs_to_update)
@@ -80,7 +86,7 @@ module ForemanMaintain::Scenarios
       # 2. Update the foreman-maintain packages from next major version repository
       # 3. Rollback the repository to current major version
 
-      add_step(Procedures::Repositories::Setup.new(:version => upstream_target_version))
+      add_step(Procedures::Repositories::Setup.new(:version => target_version))
       add_step(Procedures::Packages::Update.new(packages: pkgs_to_update, assumeyes: true))
     ensure
       rollback_repositories

data/definitions/scenarios/update.rb

@@ -28,6 +28,7 @@ module Scenarios::Update
         Checks::SystemRegistration,
         Checks::CheckHotfixInstalled,
         Checks::CheckTmout,
+        Checks::CheckIpv6Disable,
         Checks::CheckUpstreamRepository,
         Checks::Disk::AvailableSpace,
         Checks::Disk::AvailableSpaceCandlepin, # if candlepin

data/lib/foreman_maintain/cli/upgrade_command.rb

@@ -56,16 +56,6 @@ module ForemanMaintain
         !disable_self_upgrade?
       end
 
-      subcommand 'list-versions', 'List versions this system is upgradable to' do
-        disable_self_upgrade_option
-
-        def execute
-          ForemanMaintain.validate_downstream_packages
-          ForemanMaintain.perform_self_upgrade if allow_self_upgrade?
-          print_versions(UpgradeRunner.available_targets)
-        end
-      end
-
       subcommand 'check', 'Run pre-upgrade checks before upgrading to specified version' do
         target_version_option
         interactive_option
@@ -84,21 +74,10 @@ module ForemanMaintain
         interactive_option
         disable_self_upgrade_option
 
-        option '--phase', 'phase', 'run only a specific phase', :required => false do |phase|
-          unless UpgradeRunner::PHASES.include?(phase.to_sym)
-            raise Error::UsageError, "Unknown phase #{phase}"
-          end
-          phase
-        end
-
         def execute
           ForemanMaintain.validate_downstream_packages
           ForemanMaintain.perform_self_upgrade if allow_self_upgrade?
-          if phase
-            upgrade_runner.run_phase(phase.to_sym)
-          else
-            upgrade_runner.run
-          end
+          upgrade_runner.run
           upgrade_runner.save
           exit upgrade_runner.exit_code
         end

data/lib/foreman_maintain/concerns/base_database.rb

@@ -41,12 +41,6 @@ module ForemanMaintain
         raise NotImplementedError
       end
 
-      def config_files
-        [
-          '/etc/systemd/system/postgresql.service',
-        ]
-      end
-
       def local?(config = configuration)
         ['localhost', '127.0.0.1', `hostname`.strip].include? config['host']
       end

data/lib/foreman_maintain/concerns/system_helpers.rb

@@ -100,7 +100,7 @@ module ForemanMaintain
       end
 
       def packages_action(action, packages, options = {})
-        options.validate_options!(:assumeyes, :options, :download_only)
+        options.validate_options!(:assumeyes, :options, :download_only, :enabled_repos)
         case action
         when :install
           package_manager.install(packages, :assumeyes => options[:assumeyes])
@@ -108,7 +108,8 @@ module ForemanMaintain
           package_manager.update(
             packages,
             :assumeyes => options[:assumeyes],
-            :download_only => options[:download_only]
+            :download_only => options[:download_only],
+            :enabled_repos => options[:enabled_repos]
           )
         when :remove
           package_manager.remove(packages, :assumeyes => options[:assumeyes])

data/lib/foreman_maintain/package_manager/apt.rb

@@ -19,10 +19,12 @@ module ForemanMaintain::PackageManager
       apt_action('remove', packages, :assumeyes => assumeyes)
     end
 
-    def update(packages = [], assumeyes: false, download_only: false)
+    # rubocop:disable Lint/UnusedMethodArgument
+    def update(packages = [], assumeyes: false, download_only: false, enabled_repos: [])
       action = packages.any? ? '--only-upgrade install' : 'upgrade'
       apt_action(action, packages, :assumeyes => assumeyes, :download_only => download_only)
     end
+    # rubocop:enable Lint/UnusedMethodArgument
 
     def clean_cache(assumeyes: false)
       apt_action('clean', [], :assumeyes => assumeyes)

data/lib/foreman_maintain/package_manager/dnf.rb

@@ -59,12 +59,13 @@ module ForemanMaintain::PackageManager
       dnf_action('remove', packages, assumeyes: assumeyes)
     end
 
-    def update(packages = [], assumeyes: false, download_only: false)
+    def update(packages = [], assumeyes: false, download_only: false, enabled_repos: [])
       dnf_action(
         'update',
         packages,
         assumeyes: assumeyes,
-        download_only: download_only
+        download_only: download_only,
+        enabled_repos: enabled_repos
       )
     end
 
@@ -132,14 +133,18 @@ module ForemanMaintain::PackageManager
 
     private
 
-    # rubocop:disable Layout/LineLength, Metrics/ParameterLists
-    def dnf_action(action, packages, with_status: false, assumeyes: false, dnf_options: [], valid_exit_statuses: [0], download_only: false)
+    # rubocop:disable Layout/LineLength, Metrics/ParameterLists, Metrics/MethodLength
+    def dnf_action(action, packages, with_status: false, assumeyes: false, dnf_options: [], valid_exit_statuses: [0], download_only: false, enabled_repos: [])
       packages = [packages].flatten(1)
 
       dnf_options << '-y' if assumeyes
       dnf_options << '--downloadonly' if download_only
       dnf_options << '--disableplugin=foreman-protector'
 
+      enabled_repos.map do |id|
+        dnf_options << "--enablerepo=#{id}"
+      end
+
       command = ['dnf', dnf_options.join(' '), action]
 
       command.push(packages.join(' ')) unless packages.empty?
@@ -158,7 +163,7 @@ module ForemanMaintain::PackageManager
         )
       end
     end
-    # rubocop:enable Layout/LineLength, Metrics/ParameterLists
+    # rubocop:enable Layout/LineLength, Metrics/ParameterLists, Metrics/MethodLength
 
     def protector_config
       File.exist?(protector_config_file) ? File.read(protector_config_file) : ''

data/lib/foreman_maintain/utils/backup.rb

@@ -183,24 +183,7 @@ module ForemanMaintain
 
       def validate_hostname?
         # make sure that the system hostname is the same as the backup
-        hostname_from_metadata = metadata.fetch('hostname', nil)
-        if hostname_from_metadata
-          hostname_from_metadata == hostname
-        else
-          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
+        metadata.fetch('hostname', nil) == hostname
       end
 
       def validate_interfaces
@@ -240,10 +223,18 @@ module ForemanMaintain
           file_map[:pgsql_data][:present]
       end
 
+      def sql_tar_files_exist?
+        file_map[:pgsql_data][:present]
+      end
+
       def sql_dump_files_exist?
         file_map[:foreman_dump][:present] ||
           file_map[:candlepin_dump][:present] ||
-          (feature(:pulpcore_database) && file_map[:pulpcore_dump][:present])
+          file_map[:pulpcore_dump][:present]
+      end
+
+      def sql_needs_dump_restore?
+        !sql_tar_files_exist? && sql_dump_files_exist?
       end
 
       def incremental?
@@ -262,10 +253,6 @@ module ForemanMaintain
         installed_rpms.any? { |rpm| rpm.start_with?('puppetserver-') }
       end
 
-      def with_qpidd?
-        installed_rpms.any? { |rpm| rpm.start_with?('qpid-cpp-server-') }
-      end
-
       def source_os_version
         metadata.fetch('os_version', 'unknown')
       end

data/lib/foreman_maintain/version.rb

@@ -1,3 +1,3 @@
 module ForemanMaintain
-  VERSION = '1.6.7'.freeze
+  VERSION = '1.6.9'.freeze
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: foreman_maintain
 version: !ruby/object:Gem::Version
-  version: 1.6.7
+  version: 1.6.9
 platform: ruby
 authors:
 - Ivan Nečas
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2024-05-06 00:00:00.000000000 Z
+date: 2024-06-11 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: clamp
@@ -160,6 +160,7 @@ files:
 - definitions/checks/backup/certs_tar_exist.rb
 - definitions/checks/candlepin/db_up.rb
 - definitions/checks/check_hotfix_installed.rb
+- definitions/checks/check_ipv6_disable.rb
 - definitions/checks/check_tmout.rb
 - definitions/checks/disk/available_space.rb
 - definitions/checks/disk/available_space_candlepin.rb
@@ -211,7 +212,6 @@ files:
 - definitions/features/foreman_proxy.rb
 - definitions/features/foreman_server.rb
 - definitions/features/foreman_tasks.rb
-- definitions/features/gofer.rb
 - definitions/features/hammer.rb
 - definitions/features/installer.rb
 - definitions/features/instance.rb
@@ -274,7 +274,7 @@ files:
 - definitions/procedures/packages/unlock_versions.rb
 - definitions/procedures/packages/update.rb
 - definitions/procedures/packages/update_all_confirmation.rb
-- definitions/procedures/pulpcore/migrate.rb
+- definitions/procedures/pulpcore/container_handle_image_metadata.rb
 - definitions/procedures/pulpcore/trim_rpm_changelogs.rb
 - definitions/procedures/puppet/delete_empty_ca_cert_request_files.rb
 - definitions/procedures/puppet/remove_puppet.rb
@@ -286,7 +286,6 @@ files:
 - 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
@@ -297,7 +296,6 @@ files:
 - definitions/procedures/restore/pulpcore_dump.rb
 - definitions/procedures/restore/reindex_databases.rb
 - definitions/procedures/restore/required_packages.rb
-- definitions/procedures/selinux/set_file_security.rb
 - definitions/procedures/service/base.rb
 - definitions/procedures/service/daemon_reload.rb
 - definitions/procedures/service/disable.rb
@@ -315,13 +313,10 @@ files:
 - definitions/scenarios/packages.rb
 - definitions/scenarios/puppet.rb
 - definitions/scenarios/restore.rb
+- definitions/scenarios/satellite_upgrade.rb
 - definitions/scenarios/self_upgrade.rb
 - definitions/scenarios/services.rb
 - definitions/scenarios/update.rb
-- definitions/scenarios/upgrade_to_capsule_6_16.rb
-- definitions/scenarios/upgrade_to_capsule_6_16_z.rb
-- definitions/scenarios/upgrade_to_satellite_6_16.rb
-- definitions/scenarios/upgrade_to_satellite_6_16_z.rb
 - extras/foreman-maintain.sh
 - extras/foreman_protector/dnf/foreman-protector.py
 - extras/foreman_protector/foreman-protector.conf

data/definitions/features/gofer.rb

@@ -1,16 +0,0 @@
-class Features::Gofer < ForemanMaintain::Feature
-  metadata do
-    label :gofer
-
-    confine do
-      find_package('gofer') &&
-        ForemanMaintain::Utils::Service::Systemd.new('goferd', 0).enabled?
-    end
-  end
-
-  def services
-    [
-      system_service('goferd', 30),
-    ]
-  end
-end

data/definitions/procedures/pulpcore/migrate.rb

@@ -1,24 +0,0 @@
-module Procedures::Pulpcore
-  class Migrate < ForemanMaintain::Procedure
-    include ForemanMaintain::Concerns::SystemService
-    include ForemanMaintain::Concerns::PulpCommon
-
-    metadata do
-      description 'Migrate pulpcore db'
-      for_feature :pulpcore
-    end
-
-    def run
-      with_spinner('Migrating pulpcore') do |spinner|
-        necessary_services = feature(:pulpcore_database).services
-        pulp_services = feature(:pulpcore).services
-
-        feature(:service).handle_services(spinner, 'start', :only => necessary_services)
-        feature(:service).handle_services(spinner, 'stop', :only => pulp_services)
-
-        spinner.update('Migrating pulpcore database')
-        execute!(pulpcore_manager('migrate --noinput'))
-      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/procedures/selinux/set_file_security.rb

@@ -1,25 +0,0 @@
-module Procedures::Selinux
-  class SetFileSecurity < ForemanMaintain::Procedure
-    metadata do
-      description 'Setting file security'
-
-      param :incremental_backup,
-        'Is the backup incremental?',
-        :required => true
-      manual_detection
-      confine do
-        File.directory?('/sys/fs/selinux')
-      end
-    end
-
-    def run
-      with_spinner('Restoring SELinux context') do |spinner|
-        if @incremental_backup
-          spinner.update('Skipping for incremental update')
-        else
-          execute!('restorecon -Rn /')
-        end
-      end
-    end
-  end
-end

data/definitions/scenarios/upgrade_to_capsule_6_16.rb

@@ -1,100 +0,0 @@
-module Scenarios::Capsule_6_16
-  class Abstract < ForemanMaintain::Scenario
-    def self.upgrade_metadata(&block)
-      metadata do
-        tags :upgrade_scenario
-        confine do
-          feature(:capsule) &&
-            (feature(:capsule).current_minor_version == '6.15' || \
-            ForemanMaintain.upgrade_in_progress == '6.16')
-        end
-        instance_eval(&block)
-      end
-    end
-
-    def target_version
-      '6.16'
-    end
-  end
-
-  class PreUpgradeCheck < Abstract
-    upgrade_metadata do
-      description 'Checks before upgrading to Capsule 6.16'
-      tags :pre_upgrade_checks
-      run_strategy :fail_slow
-    end
-
-    def compose
-      add_steps(find_checks(:default))
-      add_steps(find_checks(:pre_upgrade))
-      add_step(Checks::Disk::AvailableSpacePostgresql13)
-      add_step(Checks::Repositories::Validate.new(:version => '6.16'))
-    end
-  end
-
-  class PreMigrations < Abstract
-    upgrade_metadata do
-      description 'Procedures before migrating to Capsule 6.16'
-      tags :pre_migrations
-    end
-
-    def compose
-      add_steps(find_procedures(:pre_migrations))
-    end
-  end
-
-  class Migrations < Abstract
-    upgrade_metadata do
-      description 'Migration scripts to Capsule 6.16'
-      tags :migrations
-    end
-
-    def set_context_mapping
-      context.map(:assumeyes, Procedures::Installer::Run => :assumeyes)
-    end
-
-    def compose
-      add_step(Procedures::Repositories::Setup.new(:version => '6.16'))
-      if el8?
-        modules_to_switch = ['postgresql:13']
-        add_step(Procedures::Packages::SwitchModules.new(:module_names => modules_to_switch))
-        modules_to_enable = ["satellite-capsule:#{el_short_name}"]
-        add_step(Procedures::Packages::EnableModules.new(:module_names => modules_to_enable))
-      end
-      add_step(Procedures::Packages::Update.new(
-        :assumeyes => true,
-        :download_only => true
-      ))
-      add_step(Procedures::Service::Stop.new)
-      add_step(Procedures::Packages::Update.new(:assumeyes => true, :clean_cache => false))
-      add_step_with_context(Procedures::Installer::Run)
-    end
-  end
-
-  class PostMigrations < Abstract
-    upgrade_metadata do
-      description 'Procedures after migrating to Capsule 6.16'
-      tags :post_migrations
-    end
-
-    def compose
-      add_step(Procedures::RefreshFeatures)
-      add_step(Procedures::Service::Start.new)
-      add_steps(find_procedures(:post_migrations))
-    end
-  end
-
-  class PostUpgradeChecks < Abstract
-    upgrade_metadata do
-      description 'Checks after upgrading to Capsule 6.16'
-      tags :post_upgrade_checks
-      run_strategy :fail_slow
-    end
-
-    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_16_z.rb

@@ -1,97 +0,0 @@
-module Scenarios::Capsule_6_16_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.16' || \
-              ForemanMaintain.upgrade_in_progress == '6.16.z')
-        end
-        instance_eval(&block)
-      end
-    end
-
-    def target_version
-      '6.16.z'
-    end
-  end
-
-  class PreUpgradeCheck < Abstract
-    upgrade_metadata do
-      description 'Checks before upgrading to Capsule 6.16.z'
-      tags :pre_upgrade_checks
-      run_strategy :fail_slow
-    end
-
-    def compose
-      add_steps(find_checks(:default))
-      add_steps(find_checks(:pre_upgrade))
-      add_step(Checks::Repositories::Validate.new(:version => '6.16'))
-    end
-  end
-
-  class PreMigrations < Abstract
-    upgrade_metadata do
-      description 'Procedures before migrating to Capsule 6.16.z'
-      tags :pre_migrations
-    end
-
-    def compose
-      add_step(Procedures::Repositories::Setup.new(:version => '6.16'))
-      if el8?
-        modules_to_enable = ["satellite-capsule:#{el_short_name}"]
-        add_step(Procedures::Packages::EnableModules.new(:module_names => modules_to_enable))
-      end
-      add_step(Procedures::Packages::Update.new(
-        :assumeyes => true,
-        :download_only => true
-      ))
-      add_steps(find_procedures(:pre_migrations))
-    end
-  end
-
-  class Migrations < Abstract
-    upgrade_metadata do
-      description 'Migration scripts to Capsule 6.16.z'
-      tags :migrations
-    end
-
-    def set_context_mapping
-      context.map(:assumeyes, Procedures::Installer::Run => :assumeyes)
-    end
-
-    def compose
-      add_step(Procedures::Service::Stop.new)
-      add_step(Procedures::Packages::Update.new(:assumeyes => true, :clean_cache => false))
-      add_step_with_context(Procedures::Installer::Run)
-    end
-  end
-
-  class PostMigrations < Abstract
-    upgrade_metadata do
-      description 'Procedures after migrating to Capsule 6.16.z'
-      tags :post_migrations
-    end
-
-    def compose
-      add_step(Procedures::RefreshFeatures)
-      add_step(Procedures::Service::Start.new)
-      add_steps(find_procedures(:post_migrations))
-    end
-  end
-
-  class PostUpgradeChecks < Abstract
-    upgrade_metadata do
-      description 'Checks after upgrading to Capsule 6.16.z'
-      tags :post_upgrade_checks
-      run_strategy :fail_slow
-    end
-
-    def compose
-      add_steps(find_checks(:default))
-      add_steps(find_checks(:post_upgrade))
-      add_step(Procedures::Packages::CheckForReboot)
-    end
-  end
-end