foreman_maintain 0.8.20 → 0.8.21

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 72beb43529d9eb83adadc1f644b7e67cf8276d19527af380a94405affc16894b
-  data.tar.gz: 6a08f0bb85ad408f9dac5e904e7c6f5af30eba339e919e44d8740332fb8d33d3
+  metadata.gz: 34a580f07f36c4c9ab021f465d02b0430ac81a444765f2793a7940d18182ce25
+  data.tar.gz: ef70e629eec6f635d2515b9eea748567c2d3e559fc762a3005a0ab9a85d7e61b
 SHA512:
-  metadata.gz: 480de2bbfe003b974b86d8f5baebdd624f3ebf407260f914b368c615fbc8481eb2b6c8d7592bd25f30f1055d892d7170385cbbdd06e84ec7100cd554fae993c8
-  data.tar.gz: 752ed2fb124297336e477357786adb1f8b157fe319bb13872d6cf684a5fbd9908d4e66c482bedf23cd5ef84ff75f573030e377a0e92a65e8f555fa793b85846a
+  metadata.gz: '0797ffb2141b60a5811f62dcdddb2d600221c22df75868674a4628838a445836058b003d67296bc91a2bc4593f06dbe4bcd1223417263fb9335d4bb141dc8c14'
+  data.tar.gz: a40dd53e0d8633bd01301e2b85b2d38cf62d8ca0ab502c9c3747939d5a7b38f3fc90fc6b8f861ec956846660ab6ac0a22e2c257e3c07c3963fec945ee03cadde

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/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/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.8.20'.freeze
+  VERSION = '0.8.21'.freeze
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: foreman_maintain
 version: !ruby/object:Gem::Version
-  version: 0.8.20
+  version: 0.8.21
 platform: ruby
 authors:
 - Ivan Nečas
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2021-10-19 00:00:00.000000000 Z
+date: 2021-11-08 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: clamp
@@ -359,6 +359,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
@@ -386,6 +387,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