foreman_maintain 1.13.9 → 1.13.11

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 9edc357bbdae20b65c04e17176c5214f94adea097785a36c504a360901c14772
-  data.tar.gz: bf9021910458e5dc99d9d511842e9a69ea0d7e59fc0c0330f877bd97fd9ab350
+  metadata.gz: d48f2e58ab16af4747e31fb70a1708573abf8c1837a0942710455e3ec34a4026
+  data.tar.gz: c633d8b1721f6e3b29c03d324615b422f9e90dc524492ea5bf18d0b17f0caa90
 SHA512:
-  metadata.gz: c5228ade045696f09bee734dabd94c691604ed77bd749c627a694615b7644f9debd1757f21dc22ddcd8271208705874112f559532d69fc10b8532f4864136114
-  data.tar.gz: fc37739b1ec44a6a5dc26aea4ea356eb532afe52202194decb789cb9c53ad138f634e8462f8c0485840468518b99020f7d245d892e71b60883a4d3b055b5e65c
+  metadata.gz: 8ada0f1c1cca6a127c32b6c879848e1ad3258eb8c72c60b1d17dc0d32c1adfc496eba7ea987942adba0e3fca0c54cba916bff79d6e8423eb3c83f2014074d209
+  data.tar.gz: 4445dee86243d7457887eeadf36a55b40ec34e640d958e8adddf77621cc82e8cc3a1df57c640f718fc69e3c1a698f231f4e12fb019cf4f18e17895d5b6c644a5

data/definitions/features/puppet_server.rb

@@ -3,7 +3,10 @@ class Features::PuppetServer < ForemanMaintain::Feature
     label :puppet_server
 
     confine do
-      find_package('puppet-server') || find_package('puppetserver') || find_package('puppet')
+      find_package('puppet-server') ||
+        find_package('openvox-server') ||
+        find_package('puppetserver') ||
+        find_package('puppet')
     end
   end
 
@@ -23,7 +26,13 @@ class Features::PuppetServer < ForemanMaintain::Feature
     # We only check puppetserver and not puppet-server, as puppet-server
     # is a part of httpd and relies on httpd service to restart, therefore
     # not requiring a separate service to restart
-    find_package('puppetserver') ? [system_service('puppetserver', 30)] : []
+    return [system_service('puppetserver', 30)] if find_package('puppetserver') ||
+                                                   find_package('openvox-server')
+    []
+  end
+
+  def openvox?
+    find_package('openvox-server')
   end
 
   def find_empty_cacert_request_files

data/definitions/procedures/pulpcore/rpm_datarepair.rb

@@ -3,14 +3,20 @@ module Procedures::Pulpcore
     include ForemanMaintain::Concerns::PulpCommon
 
     metadata do
-      description 'Rename ContentArtifact relative_paths to match `{N-V-R.A.rpm}`'
+      description 'Run Pulp RPM data repair commands'
       for_feature :pulpcore
     end
 
     def run
-      with_spinner('Running pulpcore-manager rpm-datarepair 4073') do
-        # Assumption: services are already started
-        execute!(pulpcore_manager('rpm-datarepair 4073'))
+      # Fix package_signing_fingerprint empty strings (SAT-42632 / PULP-1263)
+      # Do not fail if unavailable
+      with_spinner('Running pulpcore-manager rpm-datarepair 4007') do |spinner|
+        exit_status, output = execute_with_status(pulpcore_manager('rpm-datarepair 4007'))
+        if exit_status != 0 && output.include?("Unknown issue: '4007'")
+          spinner.update('Skipped pulpcore-manager rpm-datarepair 4007, not available')
+        elsif exit_status != 0
+          fail!(output)
+        end
       end
     end
   end

data/definitions/procedures/restore/required_packages.rb

@@ -12,6 +12,7 @@ module Procedures::Restore
       backup = ForemanMaintain::Utils::Backup.new(@backup_dir)
       required_packages = []
       required_packages << 'puppetserver' if backup.with_puppetserver?
+      required_packages << 'openvox-server' if backup.with_openvoxserver?
       if required_packages.any?
         with_spinner('Installing required packages') do
           ForemanMaintain.package_manager.install(required_packages, assumeyes: true)

data/definitions/scenarios/self_upgrade.rb

@@ -4,7 +4,10 @@ module ForemanMaintain::Scenarios
     include ForemanMaintain::Concerns::Versions
 
     def target_version
-      feature(:instance).target_version
+      @target_version ||= begin
+        v = Gem::Version.new(feature(:instance).target_version)
+        "#{v.segments[0]}.#{v.segments[1] + 1}"
+      end
     end
 
     def current_version
@@ -39,19 +42,30 @@ module ForemanMaintain::Scenarios
       true
     end
 
+    def maintain_version
+      @maintain_version ||= feature(:instance).target_version
+    end
+
+    def current_major
+      Gem::Version.new(current_version).segments[0..1].join('.')
+    end
+
+    def upgrade_repo_version
+      Gem::Version.new(current_version).bump.segments[0..1].join('.')
+    end
+
     def req_repos_to_update_pkgs
+      version = upgrade_repo_version
       if use_rhsm?
-        main_rh_repos + [maintenance_repo_id(target_version)]
+        main_rh_repos + [maintenance_repo_id(version)]
       else
-        [maintenance_repo_id(target_version)]
+        [maintenance_repo_id(version)]
       end
     end
 
     def self_upgrade_allowed?
-      target = Gem::Version.new(target_version).version
-
-      Gem::Version.new(current_version).segments[0..1].join('.') == target ||
-        Gem::Version.new(current_version).bump.segments[0..1].join('.') == target
+      current_major == maintain_version ||
+        Gem::Version.new(current_version).bump.segments[0..1].join('.') == maintain_version
     end
   end
 
@@ -67,10 +81,10 @@ module ForemanMaintain::Scenarios
       unless self_upgrade_allowed?
         raise(
           ForemanMaintain::Error::Warn,
-          "foreman-maintain is too many versions ahead. The target " \
-          "version is #{target_version} while the currently installed " \
-          "version is #{current_version}. Please rollback " \
-          "foreman-maintain to the proper version."
+          "foreman-maintain does not support the installed version of Satellite." \
+          "The currently installed version in #{current_version}," \
+          "while foreman-maintain only supports #{maintain_version}." \
+          "Please install the right version of foreman-maintain."
         )
       end
 

data/lib/foreman_maintain/utils/backup.rb

@@ -179,6 +179,10 @@ module ForemanMaintain
         installed_rpms.any? { |rpm| rpm.start_with?('puppetserver-') }
       end
 
+      def with_openvoxserver?
+        installed_rpms.any? { |rpm| rpm.start_with?('openvox-server-') }
+      end
+
       def source_os_version
         metadata.fetch('os_version', 'unknown')
       end

data/lib/foreman_maintain/version.rb

@@ -1,3 +1,3 @@
 module ForemanMaintain
-  VERSION = '1.13.9'.freeze
+  VERSION = '1.13.11'.freeze
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: foreman_maintain
 version: !ruby/object:Gem::Version
-  version: 1.13.9
+  version: 1.13.11
 platform: ruby
 authors:
 - Ivan Nečas
@@ -490,7 +490,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 4.0.10
+rubygems_version: 4.0.16
 specification_version: 4
 summary: Foreman maintenance tool belt
 test_files: []