foreman_maintain 1.2.8 → 1.2.10

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: e83e212f9fbf31738c939454ad7978b9d29beb66b66cbfb5d905e2a15aebe1af
-  data.tar.gz: b09528f68095f1139ab66e1dbdb7587e79b1c7d5e135626f94e60f7abb17e393
+  metadata.gz: d0eb23991240b71cb8622a1c54108ee7f18ec76cc439e6cc5784241ea75963e5
+  data.tar.gz: eb417792c98776024dcc5ce989e2992eecd57145d333c1072e8c6a43a269d265
 SHA512:
-  metadata.gz: 69809841cb9ede602ae08a7c3c57b777be895aa80795ecc6293961f5411ae3fd5872b7f1eb5f0ad8c06e33a0ee594897e1d08413866ecfbf34daf941db07a742
-  data.tar.gz: 00cd8080285c9e9a2809de32bb500585c641fdd740dd23895ee02f8767540be97cf36d1c34790a25bbfbc20071b782124a30ea185dd16dd62d8f83b8d6e3208b
+  metadata.gz: 16a3b6ed67de8ff550a59dc0b975d00a250698754a70fbef4e60546e1dc54a94d4d160d951a780a087b2b2a6aa83f36720531a063adb95b39e4154b1f06ab1c9
+  data.tar.gz: 536b1b2f86c94b0eaca1566d0f5d9cdd7a6ac0caf0cf82468b4296da26ed270c0a7e4a9526c29136e6ffe1398863290fc7f9b2e6cbb650aa88c7b46412b64186

data/definitions/features/foreman_server.rb

@@ -10,11 +10,7 @@ module ForemanMaintain
       end
 
       def services
-        if execute?('systemctl is-enabled foreman')
-          [system_service('foreman', 30, :socket => 'foreman')]
-        else
-          [system_service('httpd', 30)]
-        end
+        [system_service('foreman', 30, :socket => 'foreman')]
       end
 
       def plugins

data/definitions/features/pulpcore.rb

@@ -3,17 +3,13 @@ require 'foreman_maintain/utils/service/systemd'
 class Features::Pulpcore < ForemanMaintain::Feature
   metadata do
     label :pulpcore
-
-    confine do
-      ForemanMaintain::Utils::Service::Systemd.new('pulpcore-api', 0).enabled?
-    end
   end
 
   def services
     redis_services = feature(:redis) ? feature(:redis).services : []
 
     self.class.pulpcore_common_services + configured_workers +
-      redis_services + feature(:apache).services
+      redis_services
   end
 
   def configured_workers
@@ -25,15 +21,6 @@ class Features::Pulpcore < ForemanMaintain::Feature
     end
   end
 
-  def self.pulpcore_migration_services
-    pulpcore_common_services + [
-      ForemanMaintain::Utils.system_service('pulpcore-worker@1', 20),
-      ForemanMaintain::Utils.system_service('pulpcore-worker@2', 20),
-      ForemanMaintain::Utils.system_service('pulpcore-worker@3', 20),
-      ForemanMaintain::Utils.system_service('pulpcore-worker@4', 20)
-    ]
-  end
-
   def config_files
     [
       '/etc/pulp/settings.py',
@@ -42,22 +29,9 @@ class Features::Pulpcore < ForemanMaintain::Feature
   end
 
   def self.pulpcore_common_services
-    common_services = [
+    [
       ForemanMaintain::Utils.system_service('pulpcore-api', 10, :socket => 'pulpcore-api'),
       ForemanMaintain::Utils.system_service('pulpcore-content', 10, :socket => 'pulpcore-content')
     ]
-    common_services + pulpcore_resource_manager_service
-  end
-
-  def self.pulpcore_resource_manager_service
-    # The pulpcore_resource_manager is only required on 3.14+
-    # if the old tasking system is being used
-    # The foreman-installer does not create unit file for this service,
-    # if the new tasking system is being used
-    if feature(:service).unit_file_available?('pulpcore-resource-manager.service')
-      return [ForemanMaintain::Utils.system_service('pulpcore-resource-manager', 10)]
-    end
-
-    []
   end
 end

data/definitions/procedures/pulpcore/container_repair_media_type.rb

@@ -0,0 +1,23 @@
+module Procedures::Pulpcore
+  class ContainerRepairMediaType < ForemanMaintain::Procedure
+    include ForemanMaintain::Concerns::SystemService
+
+    metadata do
+      description 'Repair container media type in the pulpcore db'
+      for_feature :pulpcore
+    end
+
+    def run
+      with_spinner('Repairing container media type in the pulpcore db') do |spinner|
+        necessary_services = feature(:pulpcore_database).services
+
+        feature(:service).handle_services(spinner, 'start', :only => necessary_services)
+
+        spinner.update('Repairing container media type')
+        execute!('PULP_SETTINGS=/etc/pulp/settings.py '\
+                 'DJANGO_SETTINGS_MODULE=pulpcore.app.settings '\
+                 'pulpcore-manager container-repair-media-type')
+      end
+    end
+  end
+end

data/definitions/scenarios/upgrade_to_capsule_6_13.rb

@@ -73,6 +73,7 @@ module Scenarios::Capsule_6_13
     def compose
       add_step(Procedures::RefreshFeatures)
       add_step(Procedures::Service::Start.new)
+      add_step(Procedures::Pulpcore::ContainerRepairMediaType.new)
       add_steps(find_procedures(:post_migrations))
     end
   end

data/definitions/scenarios/upgrade_to_satellite_6_13.rb

@@ -76,6 +76,7 @@ module Scenarios::Satellite_6_13
       add_step(Procedures::RefreshFeatures)
       add_step(Procedures::Service::Start.new)
       add_step(Procedures::Pulpcore::TrimRpmChangelogs.new)
+      add_step(Procedures::Pulpcore::ContainerRepairMediaType.new)
       add_steps(find_procedures(:post_migrations))
     end
   end

data/lib/foreman_maintain/version.rb

@@ -1,3 +1,3 @@
 module ForemanMaintain
-  VERSION = '1.2.8'.freeze
+  VERSION = '1.2.10'.freeze
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: foreman_maintain
 version: !ruby/object:Gem::Version
-  version: 1.2.8
+  version: 1.2.10
 platform: ruby
 authors:
 - Ivan Nečas
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2023-03-21 00:00:00.000000000 Z
+date: 2023-06-20 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: clamp
@@ -300,6 +300,7 @@ files:
 - definitions/procedures/pulp/migrate.rb
 - definitions/procedures/pulp/print_remove_instructions.rb
 - definitions/procedures/pulp/remove.rb
+- definitions/procedures/pulpcore/container_repair_media_type.rb
 - definitions/procedures/pulpcore/migrate.rb
 - definitions/procedures/pulpcore/trim_rpm_changelogs.rb
 - definitions/procedures/puppet/delete_empty_ca_cert_request_files.rb
@@ -496,7 +497,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.3.26
+rubygems_version: 3.4.10
 signing_key:
 specification_version: 4
 summary: Foreman maintenance tool belt