foreman_maintain 1.12.1 → 1.12.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: c68595e8b757aec62c30d2aca14100da46392a4a892d25ed080f6ad57f4a237d
-  data.tar.gz: 5ad55189dadfd2791e6c40b0ed4248749dab26b45356508191d2b4517497875f
+  metadata.gz: b5e95ad904a84a122e5c9d82120299674f55998997acab8c8d29af3848a78d42
+  data.tar.gz: 66e3dbc6a9f9862a23d8c9ec0dd82f5fd3e3b856fbf5d3844eadbf448b762284
 SHA512:
-  metadata.gz: a4c03cd903549a848cc1b8418eefc643a045df59e6db12b2890347280ec9854f2c6761e54cd9c2410adc81db93c563eb29a034211b5deab8b30f5f88d7386048
-  data.tar.gz: cc197601d09d86ecd99a56ab13add58ad211e49908b619c4224ecf9c7d4b57903b73ff36928b99110b9876ba72cb468c1c15bf184661de2f772ea1a33a69021d
+  metadata.gz: ab607c39722607f8e80a56ffe3406d34bed7c72335bcba543b5fe76c339bc5e12216a588d5dacbc665f943f79b07cd00c293496425c925932d2a6dd9130efc91
+  data.tar.gz: '0290ebaa45d7c32847a1d0f92b23dd12f98e0b951c486c10f2cc043d8f53c488085a3f1095e585b70e2db60b9dbb12ad5ee60bcd9eec1741cb269e5ce2b08830'

data/definitions/checks/container/podman_login.rb

@@ -5,7 +5,7 @@ module Checks::Container
       confine do
         feature(:satellite)&.connected? && feature(:containers)
       end
-      description 'Check whether podman is logged in to registry'
+      description 'Check whether podman needs to be logged in to the registry'
       tags :pre_upgrade
     end
 

data/definitions/features/iop.rb

@@ -10,7 +10,7 @@ class Features::Iop < ForemanMaintain::Feature
 
   def config_files
     [
-      '/var/lib/kafka',
+      '/var/lib/containers/storage/volumes/iop-core-kafka-data',
       '/var/lib/vmaas',
     ]
   end

data/definitions/features/iop_advisor_database.rb

@@ -23,13 +23,19 @@ class Features::IopAdvisorDatabase < ForemanMaintain::Feature
 
   private
 
+  # rubocop:disable Metrics/MethodLength
   def load_configuration
     podman_command = "podman exec iop-service-advisor-backend-api bash -c 'env |grep DB_'"
-    podman_result = execute!(podman_command, merge_stderr: false).lines.map do |l|
-      l.strip.split('=')
-    end.to_h
+    podman_result = begin
+      execute!(podman_command, merge_stderr: false).lines.map do |l|
+        l.strip.split('=')
+      end.to_h
+    rescue ForemanMaintain::Error::ExecutionError
+      {}
+    end
 
-    db_host = if podman_result['ADVISOR_DB_HOST'].start_with?('/var/run/postgresql')
+    db_host = if podman_result['ADVISOR_DB_HOST'].nil? ||
+                 podman_result['ADVISOR_DB_HOST'].start_with?('/var/run/postgresql')
                 'localhost'
               else
                 podman_result['ADVISOR_DB_HOST']
@@ -42,4 +48,5 @@ class Features::IopAdvisorDatabase < ForemanMaintain::Feature
       'username' => podman_result['ADVISOR_DB_USER'],
     }
   end
+  # rubocop:enable Metrics/MethodLength
 end

data/definitions/features/iop_inventory_database.rb

@@ -23,13 +23,19 @@ class Features::IopInventoryDatabase < ForemanMaintain::Feature
 
   private
 
+  # rubocop:disable Metrics/MethodLength
   def load_configuration
     podman_command = "podman exec iop-core-host-inventory bash -c 'env |grep INVENTORY_DB_'"
-    podman_result = execute!(podman_command, merge_stderr: false).lines.map do |l|
-      l.strip.split('=')
-    end.to_h
+    podman_result = begin
+      execute!(podman_command, merge_stderr: false).lines.map do |l|
+        l.strip.split('=')
+      end.to_h
+    rescue ForemanMaintain::Error::ExecutionError
+      {}
+    end
 
-    db_host = if podman_result['INVENTORY_DB_HOST'].start_with?('/var/run/postgresql')
+    db_host = if podman_result['INVENTORY_DB_HOST'].nil? ||
+                 podman_result['INVENTORY_DB_HOST'].start_with?('/var/run/postgresql')
                 'localhost'
               else
                 podman_result['INVENTORY_DB_HOST']
@@ -42,4 +48,5 @@ class Features::IopInventoryDatabase < ForemanMaintain::Feature
       'username' => podman_result['INVENTORY_DB_USER'],
     }
   end
+  # rubocop:enable Metrics/MethodLength
 end

data/definitions/features/iop_remediations_database.rb

@@ -23,13 +23,19 @@ class Features::IopRemediationsDatabase < ForemanMaintain::Feature
 
   private
 
+  # rubocop:disable Metrics/MethodLength
   def load_configuration
     podman_command = "podman exec iop-service-remediations-api bash -c 'env |grep DB_'"
-    podman_result = execute!(podman_command, merge_stderr: false).lines.map do |l|
-      l.strip.split('=')
-    end.to_h
+    podman_result = begin
+      execute!(podman_command, merge_stderr: false).lines.map do |l|
+        l.strip.split('=')
+      end.to_h
+    rescue ForemanMaintain::Error::ExecutionError
+      {}
+    end
 
-    db_host = if podman_result['DB_HOST'].start_with?('/var/run/postgresql')
+    db_host = if podman_result['DB_HOST'].nil? ||
+                 podman_result['DB_HOST'].start_with?('/var/run/postgresql')
                 'localhost'
               else
                 podman_result['DB_HOST']
@@ -42,4 +48,5 @@ class Features::IopRemediationsDatabase < ForemanMaintain::Feature
       'username' => podman_result['DB_USERNAME'],
     }
   end
+  # rubocop:enable Metrics/MethodLength
 end

data/definitions/features/iop_vmaas_database.rb

@@ -23,13 +23,19 @@ class Features::IopVmaasDatabase < ForemanMaintain::Feature
 
   private
 
+  # rubocop:disable Metrics/MethodLength
   def load_configuration
     podman_command = "podman exec iop-service-vmaas-reposcan bash -c 'env |grep POSTGRESQL_'"
-    podman_result = execute!(podman_command, merge_stderr: false).lines.map do |l|
-      l.strip.split('=')
-    end.to_h
+    podman_result = begin
+      execute!(podman_command, merge_stderr: false).lines.map do |l|
+        l.strip.split('=')
+      end.to_h
+    rescue ForemanMaintain::Error::ExecutionError
+      {}
+    end
 
-    db_host = if podman_result['POSTGRESQL_HOST'].start_with?('/var/run/postgresql')
+    db_host = if podman_result['POSTGRESQL_HOST'].nil? ||
+                 podman_result['POSTGRESQL_HOST'].start_with?('/var/run/postgresql')
                 'localhost'
               else
                 podman_result['POSTGRESQL_HOST']
@@ -42,4 +48,5 @@ class Features::IopVmaasDatabase < ForemanMaintain::Feature
       'username' => podman_result['POSTGRESQL_USER'],
     }
   end
+  # rubocop:enable Metrics/MethodLength
 end

data/definitions/features/iop_vulnerability_database.rb

@@ -23,13 +23,19 @@ class Features::IopVulnerabilityDatabase < ForemanMaintain::Feature
 
   private
 
+  # rubocop:disable Metrics/MethodLength
   def load_configuration
     podman_command = "podman exec iop-service-vuln-manager bash -c 'env |grep POSTGRES_'"
-    podman_result = execute!(podman_command, merge_stderr: false).lines.map do |l|
-      l.strip.split('=')
-    end.to_h
+    podman_result = begin
+      execute!(podman_command, merge_stderr: false).lines.map do |l|
+        l.strip.split('=')
+      end.to_h
+    rescue ForemanMaintain::Error::ExecutionError
+      {}
+    end
 
-    db_host = if podman_result['POSTGRES_HOST'].start_with?('/var/run/postgresql')
+    db_host = if podman_result['POSTGRES_HOST'].nil? ||
+                 podman_result['POSTGRES_HOST'].start_with?('/var/run/postgresql')
                 'localhost'
               else
                 podman_result['POSTGRES_HOST']
@@ -42,4 +48,5 @@ class Features::IopVulnerabilityDatabase < ForemanMaintain::Feature
       'username' => podman_result['POSTGRES_USER'],
     }
   end
+  # rubocop:enable Metrics/MethodLength
 end

data/definitions/scenarios/foreman_upgrade.rb

@@ -90,10 +90,6 @@ module Scenarios::Foreman
 
     def compose
       add_step(Procedures::Repositories::Setup.new(:version => 'nightly'))
-      if el8?
-        modules_to_switch = ['postgresql:13']
-        add_step(Procedures::Packages::SwitchModules.new(:module_names => modules_to_switch))
-      end
 
       add_step(Procedures::Packages::Update.new(
         :assumeyes => true,

data/definitions/scenarios/satellite_upgrade.rb

@@ -92,12 +92,6 @@ module Scenarios::Satellite
 
     def compose
       add_step(Procedures::Repositories::Setup.new(:version => target_version))
-      if el8?
-        modules_to_switch = ['postgresql:13']
-        add_step(Procedures::Packages::SwitchModules.new(:module_names => modules_to_switch))
-        modules_to_enable = ["#{feature(:instance).downstream.module_name}:#{el_short_name}"]
-        add_step(Procedures::Packages::EnableModules.new(:module_names => modules_to_enable))
-      end
       add_steps(
         Procedures::Packages::Update.new(
           :assumeyes => true,

data/definitions/scenarios/self_upgrade.rb

@@ -74,8 +74,6 @@ module ForemanMaintain::Scenarios
         )
       end
 
-      ForemanMaintain.enable_maintenance_module
-
       add_step(Procedures::Packages::Update.new(packages: pkgs_to_update, assumeyes: true,
         enabled_repos: req_repos_to_update_pkgs))
     end

data/lib/foreman_maintain/cli/report_command.rb

@@ -45,76 +45,11 @@ module ForemanMaintain
                    generate_report
                  end
 
-          report = condense_report(data)
+          report = Utils::ReportCondenser.condense_report(data)
           report = prefix_keys(report)
           save_report(JSON.dump(report), @output)
         end
 
-        def condense_report(data)
-          result = {}
-          %w[advisor_on_prem_remediations_count rhel_ai_workload_host_count].each do |key|
-            result[key] = data[key] || 0
-          end
-          result.merge!(aggregate_host_count(data))
-          result.merge!(aggregate_image_mode_host_count(data))
-          result.merge!(aggregate_networking_metrics(data))
-          result
-        end
-
-        # Aggregates the host count numbers. The goal is to distinguish
-        # - RHEL hosts
-        # - RedHat family but not RHEL hosts
-        # - Other hosts
-        def aggregate_host_count(data)
-          result = {}
-          rhel_count = data['hosts_by_os_count|RedHat'] || 0
-          rh_count = data['hosts_by_family_count|Redhat'] || 0
-          result['host_rhel_count'] = rhel_count
-          result['host_redhat_count'] = rh_count - rhel_count
-          result['host_other_count'] = data.select do |k, _|
-            k.start_with?('hosts_by_os_count')
-          end.values.sum - rhel_count - rh_count
-          result
-        end
-
-        def aggregate_image_mode_host_count(data)
-          count = data.select { |k, _| k.start_with?('image_mode_hosts_by_os_count') }.values.sum
-          { 'image_mode_host_count' => count }
-        end
-
-        def aggregate_networking_metrics(data)
-          ipv6 = any_positive?(data, %w[subnet_ipv6_count hosts_with_ipv6only_interface_count
-                                        foreman_interfaces_ipv6only_count])
-          # Deployment is considered to run in dualstack mode if:
-          # - Foreman has both ipv6 and ipv4 addresses on a single interface
-          # - or if any host in Foreman has both ipv6 and ipv4 addresses on a single interface
-          dualstack = any_positive?(data, %w[hosts_with_dualstack_interface_count
-                                             foreman_interfaces_dualstack_count])
-
-          # - or if there are both ipv4 and ipv6 subnets defined
-          dualstack |= all_positive?(data, %w[subnet_ipv4_count subnet_ipv6_count])
-
-          # - or if any host in Foreman has an interface with only an ipv4 address
-          #   as well as another interface with ipv6 address
-          dualstack |= all_positive?(data, %w[hosts_with_ipv4only_interface_count
-                                              hosts_with_ipv6only_interface_count])
-
-          # - or if Foreman has an interface with only an ipv4 address
-          #   as well as another interface with ipv6 address
-          dualstack |= all_positive?(data,
-            %w[foreman_interfaces_ipv4only_count foreman_interfaces_ipv6only_count])
-
-          { 'use_dualstack' => dualstack, 'use_ipv6' => ipv6 }
-        end
-
-        def all_positive?(source, keys)
-          source.values_at(*keys).map { |x| x || 0 }.all?(&:positive?)
-        end
-
-        def any_positive?(source, keys)
-          source.values_at(*keys).map { |x| x || 0 }.any?(&:positive?)
-        end
-
         def prefix_keys(data)
           data.transform_keys { |key| 'foreman.' + key }
         end

data/lib/foreman_maintain/concerns/os_facts.rb

@@ -54,10 +54,6 @@ module ForemanMaintain
         File.exist?('/etc/redhat-release')
       end
 
-      def el8?
-        el_major_version == 8
-      end
-
       def debian?
         os_id == 'debian'
       end

data/lib/foreman_maintain/utils/report_condenser.rb

@@ -0,0 +1,72 @@
+module ForemanMaintain::Utils
+  module ReportCondenser
+    class << self
+      def condense_report(data)
+        result = {}
+        %w[advisor_on_prem_remediations_count rhel_ai_workload_host_count].each do |key|
+          result[key] = data[key] || 0
+        end
+        result.merge!(aggregate_host_count(data))
+        result.merge!(aggregate_image_mode_host_count(data))
+        result.merge!(aggregate_networking_metrics(data))
+        result
+      end
+
+      # Aggregates the host count numbers. The goal is to distinguish
+      # - RHEL hosts
+      # - RedHat family but not RHEL hosts
+      # - Other hosts
+      def aggregate_host_count(data)
+        result = {}
+        rhel_count = data['hosts_by_os_count|RedHat'] || 0
+        rh_count = data['hosts_by_family_count|Redhat'] || 0
+        result['host_rhel_count'] = rhel_count
+        result['host_redhat_without_rhel_count'] = rh_count - rhel_count
+        result['host_other_count'] = data.select do |k, _|
+          k.start_with?('hosts_by_os_count')
+        end.values.sum - rh_count
+        result
+      end
+
+      def aggregate_image_mode_host_count(data)
+        count = data.select { |k, _| k.start_with?('image_mode_hosts_by_os_count') }.values.sum
+        { 'image_mode_host_count' => count }
+      end
+
+      def aggregate_networking_metrics(data)
+        ipv6 = any_positive?(data, %w[subnet_ipv6_count hosts_with_ipv6only_interface_count
+                                      foreman_interfaces_ipv6only_count])
+        # Deployment is considered to run in dualstack mode if:
+        # - Foreman has both ipv6 and ipv4 addresses on a single interface
+        # - or if any host in Foreman has both ipv6 and ipv4 addresses on a single interface
+        dualstack = any_positive?(data, %w[hosts_with_dualstack_interface_count
+                                           foreman_interfaces_dualstack_count])
+
+        # - or if there are both ipv4 and ipv6 subnets defined
+        dualstack |= all_positive?(data, %w[subnet_ipv4_count subnet_ipv6_count])
+
+        # - or if any host in Foreman has an interface with only an ipv4 address
+        #   as well as another interface with ipv6 address
+        dualstack |= all_positive?(data, %w[hosts_with_ipv4only_interface_count
+                                            hosts_with_ipv6only_interface_count])
+
+        # - or if Foreman has an interface with only an ipv4 address
+        #   as well as another interface with ipv6 address
+        dualstack |= all_positive?(data,
+          %w[foreman_interfaces_ipv4only_count foreman_interfaces_ipv6only_count])
+
+        { 'use_dualstack' => dualstack, 'use_ipv6' => ipv6 }
+      end
+
+      private
+
+      def all_positive?(source, keys)
+        source.values_at(*keys).map { |x| x || 0 }.all?(&:positive?)
+      end
+
+      def any_positive?(source, keys)
+        source.values_at(*keys).map { |x| x || 0 }.any?(&:positive?)
+      end
+    end
+  end
+end

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

@@ -12,8 +12,9 @@ module ForemanMaintain::Utils
       def command(action)
         all = @options.fetch(:all, false)
         skip_enablement = @options.fetch(:skip_enablement, false)
-        if skip_enablement && %w[enable disable].include?(action)
-          return skip_enablement_message(action, @name)
+        if %w[enable disable].include?(action)
+          return skip_enablement_message(action, @name) if skip_enablement
+          return if generated?
         end
 
         cmd = "systemctl #{action} #{@name}"
@@ -59,6 +60,10 @@ module ForemanMaintain::Utils
         end
       end
 
+      def generated?
+        service_enabled_status == 'generated'
+      end
+
       def matches?(service)
         if service.is_a? String
           service == @name || File.fnmatch(service, @name)

data/lib/foreman_maintain/utils.rb

@@ -4,5 +4,6 @@ require 'foreman_maintain/utils/disk'
 require 'foreman_maintain/utils/bash'
 require 'foreman_maintain/utils/hash_tools'
 require 'foreman_maintain/utils/curl_response'
+require 'foreman_maintain/utils/report_condenser'
 require 'foreman_maintain/utils/service'
 require 'foreman_maintain/utils/system_helpers'

data/lib/foreman_maintain/version.rb

@@ -1,3 +1,3 @@
 module ForemanMaintain
-  VERSION = '1.12.1'.freeze
+  VERSION = '1.12.3'.freeze
 end

data/lib/foreman_maintain.rb

@@ -191,7 +191,6 @@ module ForemanMaintain
 
       puts "Checking for new version of #{packages_to_update_str}..."
 
-      enable_maintenance_module
       package_manager = ForemanMaintain.package_manager
 
       if package_manager.update_available?(packages_to_update)
@@ -204,19 +203,6 @@ module ForemanMaintain
       puts "Nothing to update, can't find new version of #{packages_to_update_str}."
     end
 
-    def enable_maintenance_module
-      return unless el8?
-
-      maintenance_module = 'satellite-maintenance:el8'
-      package_manager = ForemanMaintain.package_manager
-
-      if package_manager.module_exists?(maintenance_module) &&
-         !package_manager.module_enabled?(maintenance_module)
-        puts "\nEnabling #{maintenance_module} module"
-        package_manager.enable_module(maintenance_module)
-      end
-    end
-
     def main_package_name
       el? ? 'rubygem-foreman_maintain' : 'ruby-foreman-maintain'
     end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: foreman_maintain
 version: !ruby/object:Gem::Version
-  version: 1.12.1
+  version: 1.12.3
 platform: ruby
 authors:
 - Ivan Nečas
@@ -445,6 +445,7 @@ files:
 - lib/foreman_maintain/utils/disk/nil_device.rb
 - lib/foreman_maintain/utils/disk/stats.rb
 - lib/foreman_maintain/utils/hash_tools.rb
+- lib/foreman_maintain/utils/report_condenser.rb
 - lib/foreman_maintain/utils/response.rb
 - lib/foreman_maintain/utils/service.rb
 - lib/foreman_maintain/utils/service/abstract.rb