foreman_maintain 1.10.4 → 1.10.6

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: baf8fa7305b17f1df7c66b10f797f227cd2ee3772287dfb309e492f27ce7ddd1
-  data.tar.gz: d94c1396c1ff801615f1a09f7147dbeb5a96ef6b6b4793d93f694f2d29a5145b
+  metadata.gz: 2720755d4885da315eea59fb0ca45865830fb1fcdd1f7f957d4e0e08f4c2f9a4
+  data.tar.gz: bf1fd8cae788e546bd3c6624e064a3f4cf38a0a70ef7743b446d381242262d2a
 SHA512:
-  metadata.gz: 631ebc0eea9b43d42dd6bd6384a6e6dcb38d96adca6a9546ac2e2d011157882fd34c92a3c92c161e5f939100f06a9d19942afce68dc7d41abcf6259af6ad0a86
-  data.tar.gz: 02f23eecbdcbce3a45f2c92ce867216f2608e20572cea3cc03492e742e9f729560d457ee63f135e3da53ce925523f29af5fb4c83664ac94293bb1e218a9b5559
+  metadata.gz: b780c5babc78764365a2e1c4c74ff873ad4013b2746ddcafaad0b1b667ed8d9e3d1baedabb739c30c3d07ee139a5e775b1275d20037d86d437d8586c3ac15741
+  data.tar.gz: fcc515159a6e957bb00b2140c7f89593923bbcc544ecfcbf6a3da51f7ea6b4576d45819da4e54e3ed6039b365c26e6b01974e757015c66a1a40b450bd71a6647

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

@@ -0,0 +1,17 @@
+module Procedures::Pulpcore
+  class RpmDatarepair < ForemanMaintain::Procedure
+    include ForemanMaintain::Concerns::PulpCommon
+
+    metadata do
+      description 'Rename ContentArtifact relative_paths to match `{N-V-R.A.rpm}`'
+      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'))
+      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/foreman_upgrade.rb

@@ -116,6 +116,7 @@ module Scenarios::Foreman
       add_steps(
         Procedures::RefreshFeatures,
         Procedures::Service::Start,
+        Procedures::Pulpcore::RpmDatarepair,
         Procedures::Crond::Start,
         Procedures::SyncPlans::Enable,
         Procedures::MaintenanceMode::DisableMaintenanceMode

data/definitions/scenarios/satellite_upgrade.rb

@@ -120,6 +120,7 @@ module Scenarios::Satellite
       add_steps(
         Procedures::RefreshFeatures,
         Procedures::Service::Start,
+        Procedures::Pulpcore::RpmDatarepair,
         Procedures::Crond::Start,
         Procedures::SyncPlans::Enable,
         Procedures::MaintenanceMode::DisableMaintenanceMode,

data/lib/foreman_maintain/utils/backup.rb

@@ -203,6 +203,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.10.4'.freeze
+  VERSION = '1.10.6'.freeze
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: foreman_maintain
 version: !ruby/object:Gem::Version
-  version: 1.10.4
+  version: 1.10.6
 platform: ruby
 authors:
 - Ivan Nečas
@@ -55,16 +55,16 @@ dependencies:
   name: minitest
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '5.0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '5.0'
 - !ruby/object:Gem::Dependency
   name: minitest-reporters
   requirement: !ruby/object:Gem::Requirement
@@ -274,6 +274,7 @@ files:
 - definitions/procedures/packages/update.rb
 - definitions/procedures/packages/update_all_confirmation.rb
 - definitions/procedures/pulpcore/container_handle_image_metadata.rb
+- definitions/procedures/pulpcore/rpm_datarepair.rb
 - definitions/procedures/pulpcore/wait_for_tasks.rb
 - definitions/procedures/puppet/delete_empty_ca_cert_request_files.rb
 - definitions/procedures/puppet/remove_puppet.rb
@@ -446,7 +447,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.6.9
+rubygems_version: 4.0.16
 specification_version: 4
 summary: Foreman maintenance tool belt
 test_files: []