foreman_maintain 0.6.3 → 0.6.8

data/definitions/scenarios/upgrade_to_satellite_6_6_z.rb

@@ -49,11 +49,15 @@ module Scenarios::Satellite_6_6_z
       tags :migrations
     end
 
+    def set_context_mapping
+      context.map(:assumeyes, Procedures::Installer::Upgrade => :assumeyes)
+    end
+
     def compose
       add_step(Procedures::Repositories::Setup.new(:version => '6.6'))
       add_step(Procedures::Packages::UnlockVersions.new)
       add_step(Procedures::Packages::Update.new(:assumeyes => true))
-      add_step(Procedures::Installer::Upgrade.new)
+      add_step_with_context(Procedures::Installer::Upgrade)
     end
   end
 

data/definitions/scenarios/upgrade_to_satellite_6_7.rb

@@ -49,11 +49,15 @@ module Scenarios::Satellite_6_7
       tags :migrations
     end
 
+    def set_context_mapping
+      context.map(:assumeyes, Procedures::Installer::Upgrade => :assumeyes)
+    end
+
     def compose
       add_step(Procedures::Repositories::Setup.new(:version => '6.7'))
       add_step(Procedures::Packages::UnlockVersions.new)
       add_step(Procedures::Packages::Update.new(:assumeyes => true))
-      add_step(Procedures::Installer::Upgrade.new)
+      add_step_with_context(Procedures::Installer::Upgrade)
     end
   end
 

data/definitions/scenarios/upgrade_to_satellite_6_7_z.rb

@@ -49,11 +49,15 @@ module Scenarios::Satellite_6_7_z
       tags :migrations
     end
 
+    def set_context_mapping
+      context.map(:assumeyes, Procedures::Installer::Upgrade => :assumeyes)
+    end
+
     def compose
       add_step(Procedures::Repositories::Setup.new(:version => '6.7'))
       add_step(Procedures::Packages::UnlockVersions.new)
       add_step(Procedures::Packages::Update.new(:assumeyes => true))
-      add_step(Procedures::Installer::Upgrade.new)
+      add_step_with_context(Procedures::Installer::Upgrade)
     end
   end
 

data/definitions/scenarios/upgrade_to_satellite_6_8.rb

@@ -49,11 +49,15 @@ module Scenarios::Satellite_6_8
       tags :migrations
     end
 
+    def set_context_mapping
+      context.map(:assumeyes, Procedures::Installer::Upgrade => :assumeyes)
+    end
+
     def compose
       add_step(Procedures::Repositories::Setup.new(:version => '6.8'))
       add_step(Procedures::Packages::UnlockVersions.new)
       add_step(Procedures::Packages::Update.new(:assumeyes => true))
-      add_step(Procedures::Installer::Upgrade.new)
+      add_step_with_context(Procedures::Installer::Upgrade)
     end
   end
 

data/definitions/scenarios/upgrade_to_satellite_6_8_z.rb

@@ -49,11 +49,15 @@ module Scenarios::Satellite_6_8_z
       tags :migrations
     end
 
+    def set_context_mapping
+      context.map(:assumeyes, Procedures::Installer::Upgrade => :assumeyes)
+    end
+
     def compose
       add_step(Procedures::Repositories::Setup.new(:version => '6.8'))
       add_step(Procedures::Packages::UnlockVersions.new)
       add_step(Procedures::Packages::Update.new(:assumeyes => true))
-      add_step(Procedures::Installer::Upgrade.new)
+      add_step_with_context(Procedures::Installer::Upgrade)
     end
   end
 

data/lib/foreman_maintain.rb

@@ -143,5 +143,32 @@ module ForemanMaintain
     def upgrade_in_progress
       storage[:upgrade_target_version]
     end
+
+    def pkg_and_cmd_name
+      instance_feature = ForemanMaintain.available_features(:label => :instance).first
+      if instance_feature.downstream
+        return %w[satellite-maintain satellite-maintain]
+      end
+
+      [main_package_name, 'foreman-maintain']
+    end
+
+    def perform_self_upgrade
+      package_name, command = pkg_and_cmd_name
+
+      puts "Checking for new version of #{package_name}..."
+      if ForemanMaintain.package_manager.update_available?(main_package_name)
+        puts "\nUpdating #{package_name} package."
+        ForemanMaintain.package_manager.update(main_package_name, :assumeyes => true)
+        puts "\nThe #{package_name} package successfully updated."\
+             "\nRe-run #{command} with required options!"
+        exit 0
+      end
+      puts "Nothing to update, can't find new version of #{package_name}."
+    end
+
+    def main_package_name
+      'rubygem-foreman_maintain'
+    end
   end
 end

data/lib/foreman_maintain/cli/restore_command.rb

@@ -13,7 +13,8 @@ module ForemanMaintain
           :backup_dir => @backup_dir,
           :incremental_backup => @incremental || incremental_backup?
         )
-        run_scenario(scenario)
+        rescue_scenario = Scenarios::RestoreRescue.new
+        run_scenario(scenario, rescue_scenario)
         exit runner.exit_code
       end
 

data/lib/foreman_maintain/cli/upgrade_command.rb

@@ -6,6 +6,11 @@ module ForemanMaintain
                :required => false
       end
 
+      def self.disable_self_upgrade_option
+        option '--disable-self-upgrade', :flag, 'Disable automatic self upgrade',
+               :default => false
+      end
+
       def current_target_version
         current_target_version = ForemanMaintain::UpgradeRunner.current_target_version
         if current_target_version && target_version && target_version != current_target_version
@@ -56,8 +61,10 @@ module ForemanMaintain
       subcommand 'check', 'Run pre-upgrade checks before upgrading to specified version' do
         target_version_option
         interactive_option
+        disable_self_upgrade_option
 
         def execute
+          ForemanMaintain.perform_self_upgrade unless disable_self_upgrade?
           upgrade_runner.run_phase(:pre_upgrade_checks)
           exit upgrade_runner.exit_code
         end
@@ -66,6 +73,8 @@ module ForemanMaintain
       subcommand 'run', 'Run full upgrade to a specified version' do
         target_version_option
         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}"
@@ -74,6 +83,7 @@ module ForemanMaintain
         end
 
         def execute
+          ForemanMaintain.perform_self_upgrade unless disable_self_upgrade?
           if phase
             upgrade_runner.run_phase(phase.to_sym)
           else

data/lib/foreman_maintain/concerns/downstream.rb

@@ -87,8 +87,7 @@ module ForemanMaintain
                  else
                    "rhel-#{rh_version_major}-server-#{package_name}-#{full_version}-rpms"
                  end
-
-        if current_minor_version == '6.3' && server_version.to_s != '6.4' && (
+        if current_minor_version == '6.3' && full_version.to_s != '6.4' && (
           feature(:puppet_server) && feature(:puppet_server).puppet_version.major == 4)
           # TODO: confirm repo for capsule. It might be same repo
           repos << "rhel-#{rh_version_major}-server-satellite-tools-6.3-puppet4-rpms"
@@ -98,23 +97,19 @@ module ForemanMaintain
       end
 
       def common_repos(rh_version_major, full_version)
-        repos_arrary = common_repos_array(rh_version_major, full_version)
+        repos_arrary = if ENV['FOREMAN_MAINTAIN_USE_BETA'] == '1'
+                         ["rhel-#{rh_version_major}-server-satellite-maintenance-6-beta-rpms",
+                          "rhel-#{rh_version_major}-server-satellite-tools-6-beta-rpms"]
+                       else
+                         ["rhel-#{rh_version_major}-server-satellite-maintenance-6-rpms",
+                          "rhel-#{rh_version_major}-server-satellite-tools-#{full_version}-rpms"]
+                       end
+
         return repos_arrary.first(1) if feature(:capsule)
 
         repos_arrary
       end
 
-      def common_repos_array(rh_version_major, full_version)
-        ["rhel-#{rh_version_major}-server-satellite-maintenance-6#{use_beta}-rpms",
-         "rhel-#{rh_version_major}-server-satellite-tools-#{full_version}#{use_beta}-rpms"]
-      end
-
-      def use_beta
-        return '-beta' if ENV['FOREMAN_MAINTAIN_USE_BETA'] == '1'
-
-        nil
-      end
-
       def main_rh_repos(rh_version_major)
         ["rhel-#{rh_version_major}-server-rpms",
          "rhel-server-rhscl-#{rh_version_major}-rpms"]

data/lib/foreman_maintain/package_manager/dnf.rb

@@ -1,17 +1,23 @@
 module ForemanMaintain::PackageManager
   class Dnf < Yum
-    def clean_cache
-      dnf_action('clean', 'all')
+    def clean_cache(assumeyes: false)
+      dnf_action('clean', 'all', :assumeyes => assumeyes)
       super
     end
 
     private
 
-    def dnf_action(action, packages, assumeyes: false)
+    def dnf_action(action, packages, with_status: false, assumeyes: false)
       yum_options = []
       yum_options << '-y' if assumeyes
-      sys.execute!("dnf #{yum_options.join(' ')} #{action} #{packages.join(' ')}",
-                   :interactive => true)
+      if with_status
+        sys.execute_with_status("dnf #{yum_options.join(' ')} #{action} #{packages.join(' ')}",
+                                :interactive => !assumeyes)
+      else
+        sys.execute!("dnf #{yum_options.join(' ')} #{action} #{packages.join(' ')}",
+                     :interactive => !assumeyes)
+
+      end
     end
   end
 end

data/lib/foreman_maintain/package_manager/yum.rb

@@ -57,8 +57,13 @@ module ForemanMaintain::PackageManager
       yum_action('update', packages, :assumeyes => assumeyes)
     end
 
-    def clean_cache
-      yum_action('clean', 'all')
+    def clean_cache(assumeyes: false)
+      yum_action('clean', 'all', :assumeyes => assumeyes)
+    end
+
+    def update_available?(package)
+      cmd_output = yum_action('check-update -q', package, :with_status => true, :assumeyes => false)
+      cmd_output[0] == 100
     end
 
     def files_not_owned_by_package(directory)
@@ -96,14 +101,19 @@ module ForemanMaintain::PackageManager
       File.open(protector_config_file, 'w') { |file| file.puts config }
     end
 
-    def yum_action(action, packages, assumeyes: false)
+    def yum_action(action, packages, with_status: false, assumeyes: false)
       yum_options = []
       packages = [packages].flatten(1)
       yum_options << '-y' if assumeyes
       yum_options_s = yum_options.empty? ? '' : ' ' + yum_options.join(' ')
       packages_s = packages.empty? ? '' : ' ' + packages.join(' ')
-      sys.execute!("yum#{yum_options_s} #{action}#{packages_s}",
-                   :interactive => true)
+      if with_status
+        sys.execute_with_status("yum#{yum_options_s} #{action}#{packages_s}",
+                                :interactive => !assumeyes)
+      else
+        sys.execute!("yum#{yum_options_s} #{action}#{packages_s}",
+                     :interactive => !assumeyes)
+      end
     end
 
     def install_extras(src, dest, override: false)

data/lib/foreman_maintain/reporter/cli_reporter.rb

@@ -16,7 +16,6 @@ module ForemanMaintain
           @spinner_chars = %w[| / - \\]
           @current_line = ''
           @puts_needed = false
-          start_spinner
         end
 
         def update(line)
@@ -42,8 +41,6 @@ module ForemanMaintain
           end
         end
 
-        private
-
         def start_spinner
           @thread = Thread.new do
             loop do
@@ -53,6 +50,8 @@ module ForemanMaintain
           end
         end
 
+        private
+
         def spin
           @mutex.synchronize do
             return unless @active
@@ -80,6 +79,7 @@ module ForemanMaintain
         @line_char = '-'
         @cell_char = '|'
         @spinner = Spinner.new(self)
+        @spinner.start_spinner if @stdout.tty?
         @last_line = ''
       end
 

data/lib/foreman_maintain/utils/backup.rb

@@ -204,6 +204,10 @@ module ForemanMaintain
       def incremental?
         !!metadata.fetch('incremental', false)
       end
+
+      def online_backup?
+        !!metadata.fetch('online', false)
+      end
     end
   end
 end

data/lib/foreman_maintain/utils/facter.rb

@@ -5,7 +5,7 @@ module ForemanMaintain::Utils
     FACTER_FILES = %w[/usr/bin/facter /opt/puppetlabs/bin/facter].freeze
 
     def self.package
-      puppet_version = version(execute!('puppet --version'))
+      puppet_version = version(execute!('/opt/puppetlabs/bin/puppet --version'))
 
       puppet_version.major >= 4 ? 'puppet-agent' : 'facter'
     end

data/lib/foreman_maintain/utils/service/abstract.rb

@@ -10,6 +10,12 @@ module ForemanMaintain::Utils
         @options = options
       end
 
+      def socket
+        if @options[:socket]
+          self.class.new("#{@options[:socket]}.socket", priority)
+        end
+      end
+
       def <=>(other)
         prio_cmp = @priority <=> other.priority
         prio_cmp == 0 ? @name <=> other.name : prio_cmp

data/lib/foreman_maintain/version.rb

@@ -1,3 +1,3 @@
 module ForemanMaintain
-  VERSION = '0.6.3'.freeze
+  VERSION = '0.6.8'.freeze
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: foreman_maintain
 version: !ruby/object:Gem::Version
-  version: 0.6.3
+  version: 0.6.8
 platform: ruby
 authors:
 - Ivan Nečas
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2020-04-02 00:00:00.000000000 Z
+date: 2020-07-08 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: clamp
@@ -122,11 +122,11 @@ files:
 - definitions/checks/backup/directory_ready.rb
 - definitions/checks/candlepin/db_up.rb
 - definitions/checks/candlepin/validate_db.rb
-- definitions/checks/check_epel_repository.rb
 - definitions/checks/check_hotfix_installed.rb
 - definitions/checks/check_tmout.rb
 - definitions/checks/disk/available_space.rb
 - definitions/checks/disk/performance.rb
+- definitions/checks/env_proxy.rb
 - definitions/checks/foreman/check_corrupted_roles.rb
 - definitions/checks/foreman/check_duplicate_roles.rb
 - definitions/checks/foreman/db_up.rb
@@ -134,6 +134,7 @@ files:
 - definitions/checks/foreman/puppet_class_duplicates.rb
 - definitions/checks/foreman/validate_external_db_version.rb
 - definitions/checks/foreman_openscap/invalid_report_associations.rb
+- definitions/checks/foreman_proxy/check_tftp_storage.rb
 - definitions/checks/foreman_proxy/verify_dhcp_config_syntax.rb
 - definitions/checks/foreman_tasks/invalid/check_old.rb
 - definitions/checks/foreman_tasks/invalid/check_pending_state.rb
@@ -148,6 +149,7 @@ files:
 - definitions/checks/puppet/provide_upgrade_guide.rb
 - definitions/checks/puppet/verify_no_empty_cacert_requests.rb
 - definitions/checks/remote_execution/verify_settings_file_already_exists.rb
+- definitions/checks/repositories/check_non_rh_repository.rb
 - definitions/checks/repositories/check_upstream_repository.rb
 - definitions/checks/repositories/validate.rb
 - definitions/checks/restore/validate_backup.rb
@@ -158,6 +160,7 @@ files:
 - definitions/checks/system_registration.rb
 - definitions/checks/version_locking_enabled.rb
 - definitions/checks/yum_exclude.rb
+- definitions/features/apache.rb
 - definitions/features/candlepin.rb
 - definitions/features/candlepin_database.rb
 - definitions/features/capsule.rb
@@ -264,7 +267,7 @@ files:
 - definitions/procedures/restore/pg_global_objects.rb
 - definitions/procedures/restore/postgres_owner.rb
 - definitions/procedures/restore/pulpcore_dump.rb
-- definitions/procedures/restore/regenerate_missing_queues.rb
+- definitions/procedures/restore/regenerate_queues.rb
 - definitions/procedures/selinux/set_file_security.rb
 - definitions/procedures/service/base.rb
 - definitions/procedures/service/daemon_reload.rb
@@ -283,8 +286,6 @@ files:
 - definitions/scenarios/packages.rb
 - definitions/scenarios/restore.rb
 - definitions/scenarios/services.rb
-- definitions/scenarios/upgrade_to_capsule_6_7.rb
-- definitions/scenarios/upgrade_to_capsule_6_7_z.rb
 - definitions/scenarios/upgrade_to_capsule_6_8.rb
 - definitions/scenarios/upgrade_to_capsule_6_8_z.rb
 - definitions/scenarios/upgrade_to_satellite_6_2.rb

data/definitions/checks/check_epel_repository.rb

@@ -1,21 +0,0 @@
-class Checks::CheckEpelRepository < ForemanMaintain::Check
-  metadata do
-    label :check_epel_repository
-    description 'Check if EPEL repository enabled on system'
-    tags :pre_upgrade
-    confine do
-      feature(:instance).downstream
-    end
-  end
-
-  def run
-    with_spinner('Checking for presence of EPEL repository') do
-      assert(!epel_enabled?, 'System is subscribed to EPEL repository')
-    end
-  end
-
-  def epel_enabled?
-    system_repos = execute("yum repolist enabled -d 6 -e 0| grep -E 'Repo-baseurl|Repo-id'")
-    system_repos.to_s.match(/\bepel\b/i)
-  end
-end