foreman_maintain 0.9.1 → 0.9.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: e995fb504729078ae910121820a8f286d1256b4319d07d25f27a17768ba515af
-  data.tar.gz: 8fb3b6231928b49a6c6cd8375a14394b31839452ead4c0a7e3dbc198f405912d
+  metadata.gz: 55215ac64deedb1ab1aafcef2f6b28392b48952a9f0923be2f95706aaa26d6b4
+  data.tar.gz: 0cadfaad877d10e17658ed3650ba483a8e7b8fdd9e898d383ee3871bf88ba498
 SHA512:
-  metadata.gz: 12ff59c3185962df60825149e3f34892c6bc42071fb39b35aa701b891dd34eb71843784c161e64d0218e669e66a2f85715991f76a319f48f6fb4dbeba55ddf2f
-  data.tar.gz: 747024ed62640c6c49406f573557253e6ea96037921633ca94489c20f34f32a1a233c4f6a9bb67bdac45aa9dd8af9bb727733f7531c8d0c5303f56ce59a8ce60
+  metadata.gz: 1b2dbeddc647b557a0196fcea8e290e29a17e92a8ab38cee7acccbc165318bdd48cc43312232f928a30a2637dc290fd629fd07cfa27cdcb1808eb70b9903b261
+  data.tar.gz: 7dc280857da4485c5312d7b5047a94f1e0084da1c7e798964d2d66d7068daaced1268d34fcda1033e4fd73a6bd8caec8fa6450da7e5fb52f81866abb58bc0e04

data/definitions/checks/check_for_newer_packages.rb

@@ -33,9 +33,11 @@ class Checks::CheckForNewerPackages < ForemanMaintain::Check
     end
 
     unless packages_with_updates.empty?
-      failure_message = 'An update is available for package(s): '\
-                        "#{packages_with_updates.join(',')}. Please update before proceeding!"
-      fail! failure_message
+      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"
     end
   end
 

data/definitions/checks/disk/performance.rb

@@ -39,8 +39,8 @@ module Checks
         end
       end
 
-      def default_dirs
-        @default_dirs ||= %i[pulp2 pulpcore_database mongo foreman_database].inject({}) do |dirs, f|
+      def data_dirs
+        @data_dirs ||= %i[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,20 +48,32 @@ 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 #{default_dirs.keys.join(', ')} directories."
+        'Check recommended disk speed for '\
+        "#{[data_dirs.keys | pulp_dir.keys].join(', ')} directories."
+      end
+
+      def all_dirs
+        data_dirs.values | pulp_dir.values
       end
 
       def check_only_single_device?
-        default_dirs.values do |dir|
+        all_dirs.each do |dir|
           ForemanMaintain::Utils::Disk::Device.new(dir).name
         end.uniq.length <= 1
       end
 
       def dirs_to_check
-        return default_dirs.values.first(1) if check_only_single_device?
+        return all_dirs.first(1) if check_only_single_device?
 
-        default_dirs.values
+        all_dirs
       end
 
       private
@@ -74,11 +86,10 @@ 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/features/foreman_tasks.rb

@@ -17,6 +17,17 @@ 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

data/definitions/procedures/content/prepare.rb

@@ -10,7 +10,7 @@ module Procedures::Content
       sleep(20) # in satellite 6.9 the services are still coming up
       # use interactive to get realtime output
       env_vars = @quiet ? '' : 'preserve_output=true '
-      puts execute!("#{env_vars}foreman-rake katello:pulp3_migration", :interactive => true)
+      execute!("#{env_vars}foreman-rake katello:pulp3_migration", :interactive => true)
     end
   end
 end

data/definitions/procedures/installer/upgrade_rake_task.rb

@@ -5,7 +5,9 @@ module Procedures::Installer
     end
 
     def run
-      execute!('foreman-rake upgrade: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)
     end
   end
 end

data/definitions/scenarios/restore.rb

@@ -43,6 +43,8 @@ module ForemanMaintain::Scenarios
       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

data/lib/foreman_maintain/concerns/el_repos_manager_common.rb

@@ -0,0 +1,20 @@
+module ForemanMaintain
+  module Concerns
+    module ElReposManagerCommon
+    include ForemanMaintain::Concerns::OsFacts
+
+    	def package_manager
+    		return 'dnf' if el8?
+
+    		'yum'
+    	end
+
+     	def enabled_repos_hash
+        repos = execute("#{package_manager} repolist enabled -d 6 -e 0 2> /dev/null | grep -E 'Repo-id|Repo-baseurl'")
+    	  return {} if repos.empty?
+
+    	  Hash[*repos.delete!(' ').split("\n")]
+  	  end
+    end
+  end
+end

data/lib/foreman_maintain/repos_manager/dnf_config_manager.rb

@@ -0,0 +1,13 @@
+module ForemanMaintain::ReposManager
+	class DnfConfigManager
+		include ForemanMaintain::Concerns::ElReposManagerCommon
+
+    def disable_repos(repo_ids)
+      execute!("dnf config-manager --set-disabled #{repo_ids.join(',')}")
+    end
+    
+    def enable_repos(repo_ids)
+      execute!("dnf config-manager --set-enabled #{repo_ids.join(',')}")
+    end
+	end
+end

data/lib/foreman_maintain/repos_manager/yum_config_manager.rb

@@ -0,0 +1,20 @@
+module ForemanMaintain::ReposManager
+	class YumConfigManager
+		include ForemanMaintain::Concerns::ElReposManagerCommon
+		
+		def disable_repos(repo_ids)
+      execute!("yum-config-manager --disable #{repo_ids.join(',')}")
+    end
+
+    def enable_repos(repo_ids)
+      execute!("yum-config-manager --enable #{repo_ids.join(',')}")
+    end
+
+    def enabled_repos_hash
+    	repos = execute("yum repolist enabled -d 6 -e 0 2> /dev/null | grep -E 'Repo-id|Repo-baseurl'")
+    	return {} if repos.empty?
+
+    	Hash[*repos.delete!(' ').split("\n")]
+  	end
+	end
+end

data/lib/foreman_maintain/utils/backup.rb

@@ -291,7 +291,7 @@ module ForemanMaintain
         # 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')
+        system_interfaces = Dir.entries('/sys/class/net') - ['.', '..']
 
         proxy_config = metadata.fetch('proxy_config', {})
 

data/lib/foreman_maintain/utils/command_runner.rb

@@ -66,7 +66,8 @@ module ForemanMaintain
         log_file = Tempfile.open('captured-output')
         exit_file = Tempfile.open('captured-exit-code')
         Kernel.system(
-          "bash -c '#{full_command}; echo $? > #{exit_file.path}' | tee -i #{log_file.path}"
+          "stdbuf -oL -eL 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/version.rb

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

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: foreman_maintain
 version: !ruby/object:Gem::Version
-  version: 0.9.1
+  version: 0.9.2
 platform: ruby
 authors:
 - Ivan Nečas
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2021-10-20 00:00:00.000000000 Z
+date: 2021-11-10 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: clamp
@@ -374,6 +374,7 @@ files:
 - lib/foreman_maintain/concerns/base_database.rb
 - lib/foreman_maintain/concerns/directory_marker.rb
 - lib/foreman_maintain/concerns/downstream.rb
+- lib/foreman_maintain/concerns/el_repos_manager_common.rb
 - lib/foreman_maintain/concerns/finders.rb
 - lib/foreman_maintain/concerns/hammer.rb
 - lib/foreman_maintain/concerns/logger.rb
@@ -402,6 +403,9 @@ files:
 - lib/foreman_maintain/procedure.rb
 - lib/foreman_maintain/reporter.rb
 - lib/foreman_maintain/reporter/cli_reporter.rb
+- lib/foreman_maintain/repos_manager/dnf_config_manager.rb
+- lib/foreman_maintain/repos_manager/el_common.rb
+- lib/foreman_maintain/repos_manager/yum_config_manager.rb
 - lib/foreman_maintain/runner.rb
 - lib/foreman_maintain/runner/execution.rb
 - lib/foreman_maintain/runner/stored_execution.rb