foreman_maintain 0.6.14 → 0.6.15

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: ae5019f17555d2bd1f46cb58469c2a8e9134a7b0723628a08f27ed918703dc53
-  data.tar.gz: f12b8fbf32055f25abd89ba4c9a8ed72cb26438db24c0bfd143cb0fe52204d48
+  metadata.gz: ddf7d7720cb922e61c0d6245c14929ebb3745307b7b166f89921667a4948d4f1
+  data.tar.gz: 88c7794cbeb2c13d0bb8e86f4762a516ceec7e7ac48aa03b4c00bcb12bcbe33f
 SHA512:
-  metadata.gz: b160fc0f48f6a873ea32596abd608f21976e06e6505fe1cc909b3000df0fdd6c41df713fa02f2e5280d2b2abfe923efe3a2c440036f53d0c5348c018fb740594
-  data.tar.gz: 382123bb454e8afcb46e375c5fd52ead52081ffb76ba2ceac6cbd4896e9d9d1fb4e5f9d2d7dc16f1b22362a57877782017165b1baa3cb69f87e10a2402a0802a
+  metadata.gz: 786f1416f313f3a60d8109edf2c25636770c6592ffb74d921587d23b4da89f1fdd034cb42e610a1df86b54d9118e97b12f7bc8e004019ab664655d577893c1f9
+  data.tar.gz: 672090585c8fa8b490af89bc9fe14b94aca471ef1457e0553697285e24f20878e2c9743054c6451364418f6d403f129bef6636c7615605a43503843a133b7c83

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/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/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/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.14'.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.14
+  version: 0.6.15
 platform: ruby
 authors:
 - Ivan Nečas
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2020-11-25 00:00:00.000000000 Z
+date: 2021-01-25 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: clamp
@@ -338,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