foreman_maintain 0.6.10 → 0.6.15

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: e382b3653ec4332ef6bc891b83e92263874dfc079fb84c1f3db951696804832e
-  data.tar.gz: 03b8467289528688c03ed6ad7b8361befee931c9eb0d51a897aa38a755b9ad8a
+  metadata.gz: ddf7d7720cb922e61c0d6245c14929ebb3745307b7b166f89921667a4948d4f1
+  data.tar.gz: 88c7794cbeb2c13d0bb8e86f4762a516ceec7e7ac48aa03b4c00bcb12bcbe33f
 SHA512:
-  metadata.gz: 0f9b4071adbda3fb4f39c84a6c02891aa4e54c0138d8245dfb2da93844bbc6b51e8db88a0424a006fde8563b7b4806b833176caeacaaa9c4b3101ef23824c4f0
-  data.tar.gz: a00abc28ccc812b76de1ca75849f471bd16944fb3cd8bc7ead833f0c077c17e1860626ba6e9c52af834fa1f21c2a6c6b0c331551bc435d921926fdc694cda045
+  metadata.gz: 786f1416f313f3a60d8109edf2c25636770c6592ffb74d921587d23b4da89f1fdd034cb42e610a1df86b54d9118e97b12f7bc8e004019ab664655d577893c1f9
+  data.tar.gz: 672090585c8fa8b490af89bc9fe14b94aca471ef1457e0553697285e24f20878e2c9743054c6451364418f6d403f129bef6636c7615605a43503843a133b7c83

data/definitions/checks/foreman/check_checkpoint_segments.rb

@@ -18,31 +18,39 @@ module Checks
       # rubocop:disable Metrics/MethodLength
       def check_custom_hiera
         hiera_file = feature(:installer).custom_hiera_file
-        if (config = YAML.load_file(hiera_file)) &&
-           config.key?('postgresql::server::config_entries')
-          if config['postgresql::server::config_entries'].nil?
-            return <<-MESSAGE.strip_heredoc
-            ERROR: 'postgresql::server::config_entries' cannot be null.
-            Please remove it from following file and re-run the command.
-            - #{hiera_file}
-            MESSAGE
-          elsif config['postgresql::server::config_entries'].key?('checkpoint_segments')
-            message = <<-MESSAGE.strip_heredoc
-            ERROR: Tuning option 'checkpoint_segments' found.
-            This option is no longer valid for PostgreSQL 9.5 or newer.
-            Please remove it from following file and re-run the command.
-            - #{hiera_file}
-            MESSAGE
-            if feature(:katello)
-              message += <<-MESSAGE.strip_heredoc
-              The presence of checkpoint_segments in #{hiera_file} indicates manual tuning.
-              Manual tuning can override values provided by the --tuning parameter.
-              Review #{hiera_file} for values that are already provided by the built in tuning profiles.
-              Built in tuning profiles also provide a supported upgrade path.
+        begin
+          config = YAML.load_file(hiera_file)
+          if config.is_a?(Hash) && config.key?('postgresql::server::config_entries')
+            if config['postgresql::server::config_entries'].nil?
+              return <<-MESSAGE.strip_heredoc
+              ERROR: 'postgresql::server::config_entries' cannot be null.
+              Please remove it from following file and re-run the command.
+              - #{hiera_file}
               MESSAGE
+            elsif config['postgresql::server::config_entries'].key?('checkpoint_segments')
+              message = <<-MESSAGE.strip_heredoc
+              ERROR: Tuning option 'checkpoint_segments' found.
+              This option is no longer valid for PostgreSQL 9.5 or newer.
+              Please remove it from following file and re-run the command.
+              - #{hiera_file}
+              MESSAGE
+              if feature(:katello)
+                message += <<-MESSAGE.strip_heredoc
+                The presence of checkpoint_segments in #{hiera_file} indicates manual tuning.
+                Manual tuning can override values provided by the --tuning parameter.
+                Review #{hiera_file} for values that are already provided by the built in tuning profiles.
+                Built in tuning profiles also provide a supported upgrade path.
+                MESSAGE
+              end
+              return message
             end
-            return message
+          elsif config.is_a?(String)
+            fail! "Error: File #{hiera_file} is not a yaml file."
+            exit 1
           end
+        rescue Psych::SyntaxError
+          fail! "Found syntax error in file: #{hiera_file}"
+          exit 1
         end
       end
       # rubocop:enable Metrics/MethodLength

data/definitions/features/dynflow_sidekiq.rb

@@ -7,10 +7,6 @@ class Features::DynflowSidekiq < ForemanMaintain::Feature
     end
   end
 
-  def services
-    service_names.map { |service| system_service service, instance_priority(service) }
-  end
-
   def config_files
     # Workaround until foreman-installer can deploy scaled workers
     service_symlinks = configured_instances.map do |service|
@@ -22,6 +18,13 @@ class Features::DynflowSidekiq < ForemanMaintain::Feature
     ].flatten
   end
 
+  def services
+    service_names.map do |service|
+      system_service service, instance_priority(service),
+                     :instance_parent_unit => 'dynflow-sidekiq@'
+    end
+  end
+
   private
 
   def instance_priority(instance)

data/definitions/procedures/installer/upgrade_rake_task.rb

@@ -0,0 +1,11 @@
+module Procedures::Installer
+  class UpgradeRakeTask < ForemanMaintain::Procedure
+    metadata do
+      description 'Execute upgrade:run rake task'
+    end
+
+    def run
+      execute!('foreman-rake upgrade:run')
+    end
+  end
+end

data/definitions/procedures/service/list.rb

@@ -16,12 +16,22 @@ module Procedures::Service
 
     def unit_files_list(services)
       if systemd_installed?
-        regex = services.map { |service| "^#{service.name}.service" }.join('\|')
-        execute("systemctl list-unit-files | grep '#{regex}'")
+        execute("systemctl list-unit-files --type=service | \
+                 grep '#{build_regex_for_services(services)}'")
       else
         regex = services.map { |service| "^#{service.name} " }.join('\|')
         execute("chkconfig --list 2>&1 | grep '#{regex}'")
       end
     end
+
+    def build_regex_for_services(services)
+      services.map do |service|
+        if service.respond_to?(:instance_parent_unit) && service.instance_parent_unit
+          "^#{service.instance_parent_unit}.service"
+        else
+          "^#{service.name}.service"
+        end
+      end.join('\|')
+    end
   end
 end

data/definitions/scenarios/upgrade_to_satellite_6_8.rb

@@ -59,6 +59,7 @@ module Scenarios::Satellite_6_8
       add_step(Procedures::Packages::UnlockVersions.new)
       add_step(Procedures::Packages::Update.new(:assumeyes => true))
       add_step_with_context(Procedures::Installer::Upgrade)
+      add_step(Procedures::Installer::UpgradeRakeTask)
     end
   end
 

data/definitions/scenarios/upgrade_to_satellite_6_8_z.rb

@@ -58,6 +58,7 @@ module Scenarios::Satellite_6_8_z
       add_step(Procedures::Packages::UnlockVersions.new)
       add_step(Procedures::Packages::Update.new(:assumeyes => true))
       add_step_with_context(Procedures::Installer::Upgrade)
+      add_step(Procedures::Installer::UpgradeRakeTask)
     end
   end
 

data/extras/foreman_protector/foreman-protector.whitelist

@@ -16,5 +16,6 @@ rdma-core
 boost-random
 boost-iostreams
 boost-thread
+yum-utils
 # foreman-maintain
 rubygem-foreman_maintain

data/lib/foreman_maintain.rb

@@ -21,6 +21,7 @@ module ForemanMaintain
   require 'foreman_maintain/concerns/base_database'
   require 'foreman_maintain/concerns/directory_marker'
   require 'foreman_maintain/concerns/downstream'
+  require 'foreman_maintain/concerns/primary_checks'
   require 'foreman_maintain/top_level_modules'
   require 'foreman_maintain/yaml_storage'
   require 'foreman_maintain/config'
@@ -41,6 +42,7 @@ module ForemanMaintain
   require 'foreman_maintain/error'
 
   class << self
+    include ForemanMaintain::Concerns::PrimaryChecks
     attr_accessor :config, :logger
 
     LOGGER_LEVEL_MAPPING = {

data/lib/foreman_maintain/cli.rb

@@ -57,7 +57,7 @@ module ForemanMaintain
           raise error
         end
 
-        puts error.message
+        $stderr.puts error.message
         logger.error(error)
 
         @exit_code = 1
@@ -65,7 +65,7 @@ module ForemanMaintain
 
       def process_usage_error(error)
         log_exit_code_info(1)
-        puts error.message
+        $stderr.puts error.message
         exit!
       end
     end

data/lib/foreman_maintain/cli/upgrade_command.rb

@@ -56,6 +56,7 @@ module ForemanMaintain
         disable_self_upgrade_option
 
         def execute
+          ForemanMaintain.validate_downstream_packages
           ForemanMaintain.perform_self_upgrade unless disable_self_upgrade?
           print_versions(UpgradeRunner.available_targets)
         end
@@ -67,6 +68,7 @@ module ForemanMaintain
         disable_self_upgrade_option
 
         def execute
+          ForemanMaintain.validate_downstream_packages
           ForemanMaintain.perform_self_upgrade unless disable_self_upgrade?
           upgrade_runner.run_phase(:pre_upgrade_checks)
           exit upgrade_runner.exit_code
@@ -86,6 +88,7 @@ module ForemanMaintain
         end
 
         def execute
+          ForemanMaintain.validate_downstream_packages
           ForemanMaintain.perform_self_upgrade unless disable_self_upgrade?
           if phase
             upgrade_runner.run_phase(phase.to_sym)

data/lib/foreman_maintain/concerns/primary_checks.rb

@@ -0,0 +1,23 @@
+module ForemanMaintain
+  module Concerns
+    module PrimaryChecks
+      def validate_downstream_packages
+        return unless detector.feature(:installer) && detector.feature(:installer).with_scenarios?
+        if (package = package_name) && !package_manager.installed?(package)
+          raise ForemanMaintain::Error::Fail,
+                "Error: Important rpm package #{package} is not installed!"\
+                "\nInstall #{package} rpm to ensure system consistency."
+        end
+      end
+
+      def package_name
+        installed_scenario = detector.feature(:installer).last_scenario
+        if installed_scenario == 'satellite'
+          'satellite'
+        elsif installed_scenario == 'capsule'
+          'satellite-capsule'
+        end
+      end
+    end
+  end
+end

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

@@ -1,16 +1,17 @@
 module ForemanMaintain::Utils
   module Service
     class Systemd < Abstract
+      attr_reader :instance_parent_unit
       def initialize(name, priority, options = {})
         super
         @sys = SystemHelpers.new
+        @instance_parent_unit = options.fetch(:instance_parent_unit, nil)
       end
 
       def command(action, options = {})
         do_wait = options.fetch(:wait, true) # wait for service to start
         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)
         end

data/lib/foreman_maintain/version.rb

@@ -1,3 +1,3 @@
 module ForemanMaintain
-  VERSION = '0.6.10'.freeze
+  VERSION = '0.6.15'.freeze
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: foreman_maintain
 version: !ruby/object:Gem::Version
-  version: 0.6.10
+  version: 0.6.15
 platform: ruby
 authors:
 - Ivan Nečas
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2020-09-04 00:00:00.000000000 Z
+date: 2021-01-25 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: clamp
@@ -239,6 +239,7 @@ files:
 - definitions/procedures/hammer_setup.rb
 - definitions/procedures/installer/run.rb
 - definitions/procedures/installer/upgrade.rb
+- definitions/procedures/installer/upgrade_rake_task.rb
 - definitions/procedures/iptables/add_maintenance_mode_chain.rb
 - definitions/procedures/iptables/remove_maintenance_mode_chain.rb
 - definitions/procedures/knowledge_base_article.rb
@@ -337,6 +338,7 @@ files:
 - lib/foreman_maintain/concerns/hammer.rb
 - lib/foreman_maintain/concerns/logger.rb
 - lib/foreman_maintain/concerns/metadata.rb
+- lib/foreman_maintain/concerns/primary_checks.rb
 - lib/foreman_maintain/concerns/reporter.rb
 - lib/foreman_maintain/concerns/scenario_metadata.rb
 - lib/foreman_maintain/concerns/system_helpers.rb
@@ -404,7 +406,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.0.3
+rubygems_version: 3.0.8
 signing_key: 
 specification_version: 4
 summary: Foreman maintenance tool belt