foreman_maintain 1.2.7 → 1.2.9

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 7ccc920a2ad9478b2248e92981f894eedfdb8b2daf9f26ecb45fbdef68d8f11a
-  data.tar.gz: b7a57772a0c219bdcd60ac45396643cd45c1d1b1edeaef7a55defffad14b5a71
+  metadata.gz: 005d79a913b2e0af464c633fa94d076f9bb799c08842102ec88aecc2d451b07b
+  data.tar.gz: 527adfb7e2532896d9265ba14a4b41c36fcea399d73dcadfb6f4d924e99db710
 SHA512:
-  metadata.gz: 802d12634cbf41e4c2703c35c3b2e5843cbc7bf0c2f705199e9304e856de8c4115c1b9e5cad659ac3e38eae6fa0f2cfc1baf46c86e1b1433be0801188e3a1ee5
-  data.tar.gz: 79d2d5208fee0628b7fe6a1469b9c08a296a4ecb0ea9a9107f7f566e9b701055d1c09d21b898d4274b17ecc485af3d448564acdb873651ccbdad885f61b997b9
+  metadata.gz: 5187611879f5c8ff9a3e524cccde04a7816cb587eba2c0361078c730e9fe35d5f8a9641b247e1a80214013a83c701364dcb044fd63d226a09c9f920b5d9ad73f
+  data.tar.gz: 2ebdfe9ed7fbfb0d7e052176bf8f425faaa54bdfccc55175b059aefdcfc4b3eba7eb4cf69c852b1a838ffe0bd0a8d9e225721d9bc8c39ef0fca0575d601a4df1

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/foreman_maintain_features.rb

@@ -0,0 +1,10 @@
+class Procedures::ForemanMaintainFeatures < ForemanMaintain::Procedure
+  metadata do
+    description 'List detected Foreman Maintain features'
+  end
+
+  def run
+    features = ForemanMaintain.available_features
+    output << features.map(&:inspect).join("\n")
+  end
+end

data/definitions/procedures/pulpcore/repair_container_media_type.rb

@@ -0,0 +1,23 @@
+module Procedures::Pulpcore
+  class RepairContainerMediaType < 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/self_upgrade.rb

@@ -108,7 +108,7 @@ module ForemanMaintain::Scenarios
     end
 
     def compose
-      pkgs_to_update = %w[rubygem-foreman_maintain]
+      pkgs_to_update = [ForemanMaintain.main_package_name]
       if feature(:instance).downstream
         pkgs_to_update << 'satellite-maintain'
         downstream_self_upgrade(pkgs_to_update)

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/concerns/system_helpers.rb

@@ -30,7 +30,7 @@ module ForemanMaintain
       end
 
       def systemd_installed?
-        File.exist?('/usr/bin/systemctl')
+        File.exist?('/run/systemd/system/')
       end
 
       def check_min_version(name, minimal_version)

data/lib/foreman_maintain/version.rb

@@ -1,3 +1,3 @@
 module ForemanMaintain
-  VERSION = '1.2.7'.freeze
+  VERSION = '1.2.9'.freeze
 end

data/lib/foreman_maintain.rb

@@ -205,7 +205,7 @@ module ForemanMaintain
     end
 
     def main_package_name
-      'rubygem-foreman_maintain'
+      el? ? 'rubygem-foreman_maintain' : 'ruby-foreman-maintain'
     end
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: foreman_maintain
 version: !ruby/object:Gem::Version
-  version: 1.2.7
+  version: 1.2.9
 platform: ruby
 authors:
 - Ivan Nečas
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2023-03-08 00:00:00.000000000 Z
+date: 2023-06-07 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: clamp
@@ -269,6 +269,7 @@ files:
 - definitions/procedures/foreman/remove_duplicate_obsolete_roles.rb
 - definitions/procedures/foreman/remove_duplicate_permissions.rb
 - definitions/procedures/foreman_docker/remove_foreman_docker.rb
+- definitions/procedures/foreman_maintain_features.rb
 - definitions/procedures/foreman_openscap/invalid_report_associations.rb
 - definitions/procedures/foreman_proxy/features.rb
 - definitions/procedures/foreman_tasks/delete.rb
@@ -300,6 +301,7 @@ files:
 - definitions/procedures/pulp/print_remove_instructions.rb
 - definitions/procedures/pulp/remove.rb
 - definitions/procedures/pulpcore/migrate.rb
+- definitions/procedures/pulpcore/repair_container_media_type.rb
 - definitions/procedures/pulpcore/trim_rpm_changelogs.rb
 - definitions/procedures/puppet/delete_empty_ca_cert_request_files.rb
 - definitions/procedures/puppet/remove_puppet.rb
@@ -353,8 +355,6 @@ files:
 - definitions/scenarios/upgrade_to_capsule_6_12_z.rb
 - definitions/scenarios/upgrade_to_capsule_6_13.rb
 - definitions/scenarios/upgrade_to_capsule_6_13_z.rb
-- definitions/scenarios/upgrade_to_capsule_6_14.rb
-- definitions/scenarios/upgrade_to_capsule_6_14_z.rb
 - definitions/scenarios/upgrade_to_capsule_6_8.rb
 - definitions/scenarios/upgrade_to_capsule_6_8_z.rb
 - definitions/scenarios/upgrade_to_capsule_6_9.rb
@@ -369,8 +369,6 @@ files:
 - definitions/scenarios/upgrade_to_satellite_6_12_z.rb
 - definitions/scenarios/upgrade_to_satellite_6_13.rb
 - definitions/scenarios/upgrade_to_satellite_6_13_z.rb
-- definitions/scenarios/upgrade_to_satellite_6_14.rb
-- definitions/scenarios/upgrade_to_satellite_6_14_z.rb
 - definitions/scenarios/upgrade_to_satellite_6_2.rb
 - definitions/scenarios/upgrade_to_satellite_6_2_z.rb
 - definitions/scenarios/upgrade_to_satellite_6_3.rb
@@ -499,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

data/definitions/scenarios/upgrade_to_capsule_6_14.rb

@@ -1,92 +0,0 @@
-module Scenarios::Capsule_6_14
-  class Abstract < ForemanMaintain::Scenario
-    def self.upgrade_metadata(&block)
-      metadata do
-        tags :upgrade_scenario
-        confine do
-          feature(:capsule) &&
-            (feature(:capsule).current_minor_version == '6.13' || \
-            ForemanMaintain.upgrade_in_progress == '6.14')
-        end
-        instance_eval(&block)
-      end
-    end
-
-    def target_version
-      '6.14'
-    end
-  end
-
-  class PreUpgradeCheck < Abstract
-    upgrade_metadata do
-      description 'Checks before upgrading to Capsule 6.14'
-      tags :pre_upgrade_checks
-      run_strategy :fail_slow
-    end
-
-    def compose
-      add_steps(find_checks(:default))
-      add_steps(find_checks(:pre_upgrade))
-      add_step(Checks::Foreman::CheckpointSegments)
-      add_step(Checks::Repositories::Validate.new(:version => '6.14'))
-    end
-  end
-
-  class PreMigrations < Abstract
-    upgrade_metadata do
-      description 'Procedures before migrating to Capsule 6.14'
-      tags :pre_migrations
-    end
-
-    def compose
-      add_steps(find_procedures(:pre_migrations))
-      add_step(Procedures::Service::Stop.new)
-    end
-  end
-
-  class Migrations < Abstract
-    upgrade_metadata do
-      description 'Migration scripts to Capsule 6.14'
-      tags :migrations
-    end
-
-    def set_context_mapping
-      context.map(:assumeyes, Procedures::Installer::Upgrade => :assumeyes)
-    end
-
-    def compose
-      add_step(Procedures::Repositories::Setup.new(:version => '6.14'))
-      modules_to_enable = ["satellite-capsule:#{el_short_name}"]
-      add_step(Procedures::Packages::EnableModules.new(:module_names => modules_to_enable))
-      add_step(Procedures::Packages::UnlockVersions.new)
-      add_step(Procedures::Packages::Update.new(:assumeyes => true))
-      add_step_with_context(Procedures::Installer::Upgrade)
-    end
-  end
-
-  class PostMigrations < Abstract
-    upgrade_metadata do
-      description 'Procedures after migrating to Capsule 6.14'
-      tags :post_migrations
-    end
-
-    def compose
-      add_step(Procedures::RefreshFeatures)
-      add_step(Procedures::Service::Start.new)
-      add_steps(find_procedures(:post_migrations))
-    end
-  end
-
-  class PostUpgradeChecks < Abstract
-    upgrade_metadata do
-      description 'Checks after upgrading to Capsule 6.14'
-      tags :post_upgrade_checks
-      run_strategy :fail_slow
-    end
-
-    def compose
-      add_steps(find_checks(:default))
-      add_steps(find_checks(:post_upgrade))
-    end
-  end
-end

data/definitions/scenarios/upgrade_to_capsule_6_14_z.rb

@@ -1,92 +0,0 @@
-module Scenarios::Capsule_6_14_z
-  class Abstract < ForemanMaintain::Scenario
-    def self.upgrade_metadata(&block)
-      metadata do
-        tags :upgrade_scenario
-        confine do
-          feature(:capsule) &&
-            (feature(:capsule).current_minor_version == '6.14' || \
-              ForemanMaintain.upgrade_in_progress == '6.14.z')
-        end
-        instance_eval(&block)
-      end
-    end
-
-    def target_version
-      '6.14.z'
-    end
-  end
-
-  class PreUpgradeCheck < Abstract
-    upgrade_metadata do
-      description 'Checks before upgrading to Capsule 6.14.z'
-      tags :pre_upgrade_checks
-      run_strategy :fail_slow
-    end
-
-    def compose
-      add_steps(find_checks(:default))
-      add_steps(find_checks(:pre_upgrade))
-      add_step(Checks::Foreman::CheckpointSegments)
-      add_step(Checks::Repositories::Validate.new(:version => '6.14'))
-    end
-  end
-
-  class PreMigrations < Abstract
-    upgrade_metadata do
-      description 'Procedures before migrating to Capsule 6.14.z'
-      tags :pre_migrations
-    end
-
-    def compose
-      add_steps(find_procedures(:pre_migrations))
-      add_step(Procedures::Service::Stop.new)
-    end
-  end
-
-  class Migrations < Abstract
-    upgrade_metadata do
-      description 'Migration scripts to Capsule 6.14.z'
-      tags :migrations
-    end
-
-    def set_context_mapping
-      context.map(:assumeyes, Procedures::Installer::Upgrade => :assumeyes)
-    end
-
-    def compose
-      add_step(Procedures::Repositories::Setup.new(:version => '6.14'))
-      modules_to_enable = ["satellite-capsule:#{el_short_name}"]
-      add_step(Procedures::Packages::EnableModules.new(:module_names => modules_to_enable))
-      add_step(Procedures::Packages::UnlockVersions.new)
-      add_step(Procedures::Packages::Update.new(:assumeyes => true))
-      add_step_with_context(Procedures::Installer::Upgrade)
-    end
-  end
-
-  class PostMigrations < Abstract
-    upgrade_metadata do
-      description 'Procedures after migrating to Capsule 6.14.z'
-      tags :post_migrations
-    end
-
-    def compose
-      add_step(Procedures::RefreshFeatures)
-      add_step(Procedures::Service::Start.new)
-      add_steps(find_procedures(:post_migrations))
-    end
-  end
-
-  class PostUpgradeChecks < Abstract
-    upgrade_metadata do
-      description 'Checks after upgrading to Capsule 6.14.z'
-      tags :post_upgrade_checks
-      run_strategy :fail_slow
-    end
-
-    def compose
-      add_steps(find_checks(:default))
-      add_steps(find_checks(:post_upgrade))
-    end
-  end
-end

data/definitions/scenarios/upgrade_to_satellite_6_14.rb

@@ -1,94 +0,0 @@
-module Scenarios::Satellite_6_14
-  class Abstract < ForemanMaintain::Scenario
-    def self.upgrade_metadata(&block)
-      metadata do
-        tags :upgrade_scenario
-        confine do
-          feature(:satellite) &&
-            (feature(:satellite).current_minor_version == '6.13' || \
-            ForemanMaintain.upgrade_in_progress == '6.14')
-        end
-        instance_eval(&block)
-      end
-    end
-
-    def target_version
-      '6.14'
-    end
-  end
-
-  class PreUpgradeCheck < Abstract
-    upgrade_metadata do
-      description 'Checks before upgrading to Satellite 6.14'
-      tags :pre_upgrade_checks
-      run_strategy :fail_slow
-    end
-
-    def compose
-      add_steps(find_checks(:default))
-      add_steps(find_checks(:pre_upgrade))
-      add_step(Checks::Foreman::CheckpointSegments)
-      add_step(Checks::Repositories::Validate.new(:version => '6.14'))
-    end
-  end
-
-  class PreMigrations < Abstract
-    upgrade_metadata do
-      description 'Procedures before migrating to Satellite 6.14'
-      tags :pre_migrations
-    end
-
-    def compose
-      add_steps(find_procedures(:pre_migrations))
-      add_step(Procedures::Service::Stop.new)
-    end
-  end
-
-  class Migrations < Abstract
-    upgrade_metadata do
-      description 'Migration scripts to Satellite 6.14'
-      tags :migrations
-      run_strategy :fail_fast
-    end
-
-    def set_context_mapping
-      context.map(:assumeyes, Procedures::Installer::Upgrade => :assumeyes)
-    end
-
-    def compose
-      add_step(Procedures::Repositories::Setup.new(:version => '6.14'))
-      modules_to_enable = ["satellite:#{el_short_name}"]
-      add_step(Procedures::Packages::EnableModules.new(:module_names => modules_to_enable))
-      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
-
-  class PostMigrations < Abstract
-    upgrade_metadata do
-      description 'Procedures after migrating to Satellite 6.14'
-      tags :post_migrations
-    end
-
-    def compose
-      add_step(Procedures::RefreshFeatures)
-      add_step(Procedures::Service::Start.new)
-      add_steps(find_procedures(:post_migrations))
-    end
-  end
-
-  class PostUpgradeChecks < Abstract
-    upgrade_metadata do
-      description 'Checks after upgrading to Satellite 6.14'
-      tags :post_upgrade_checks
-      run_strategy :fail_slow
-    end
-
-    def compose
-      add_steps(find_checks(:default))
-      add_steps(find_checks(:post_upgrade))
-    end
-  end
-end

data/definitions/scenarios/upgrade_to_satellite_6_14_z.rb

@@ -1,93 +0,0 @@
-module Scenarios::Satellite_6_14_z
-  class Abstract < ForemanMaintain::Scenario
-    def self.upgrade_metadata(&block)
-      metadata do
-        tags :upgrade_scenario
-        confine do
-          feature(:satellite) &&
-            (feature(:satellite).current_minor_version == '6.14' || \
-            ForemanMaintain.upgrade_in_progress == '6.14.z')
-        end
-        instance_eval(&block)
-      end
-    end
-
-    def target_version
-      '6.14.z'
-    end
-  end
-
-  class PreUpgradeCheck < Abstract
-    upgrade_metadata do
-      description 'Checks before upgrading to Satellite 6.14.z'
-      tags :pre_upgrade_checks
-      run_strategy :fail_slow
-    end
-
-    def compose
-      add_steps(find_checks(:default))
-      add_steps(find_checks(:pre_upgrade))
-      add_step(Checks::Foreman::CheckpointSegments)
-      add_step(Checks::Repositories::Validate.new(:version => '6.14'))
-    end
-  end
-
-  class PreMigrations < Abstract
-    upgrade_metadata do
-      description 'Procedures before migrating to Satellite 6.14.z'
-      tags :pre_migrations
-    end
-
-    def compose
-      add_steps(find_procedures(:pre_migrations))
-      add_step(Procedures::Service::Stop.new)
-    end
-  end
-
-  class Migrations < Abstract
-    upgrade_metadata do
-      description 'Migration scripts to Satellite 6.14.z'
-      tags :migrations
-    end
-
-    def set_context_mapping
-      context.map(:assumeyes, Procedures::Installer::Upgrade => :assumeyes)
-    end
-
-    def compose
-      add_step(Procedures::Repositories::Setup.new(:version => '6.14'))
-      modules_to_enable = ["satellite:#{el_short_name}"]
-      add_step(Procedures::Packages::EnableModules.new(:module_names => modules_to_enable))
-      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
-
-  class PostMigrations < Abstract
-    upgrade_metadata do
-      description 'Procedures after migrating to Satellite 6.14.z'
-      tags :post_migrations
-    end
-
-    def compose
-      add_step(Procedures::RefreshFeatures)
-      add_step(Procedures::Service::Start.new)
-      add_steps(find_procedures(:post_migrations))
-    end
-  end
-
-  class PostUpgradeChecks < Abstract
-    upgrade_metadata do
-      description 'Checks after upgrading to Satellite 6.14.z'
-      tags :post_upgrade_checks
-      run_strategy :fail_slow
-    end
-
-    def compose
-      add_steps(find_checks(:default))
-      add_steps(find_checks(:post_upgrade))
-    end
-  end
-end