foreman_maintain 1.2.10 → 1.3.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: d0eb23991240b71cb8622a1c54108ee7f18ec76cc439e6cc5784241ea75963e5
-  data.tar.gz: eb417792c98776024dcc5ce989e2992eecd57145d333c1072e8c6a43a269d265
+  metadata.gz: b4d4f7fe5a4a2f6a3a992a94e7fe674a00866dac9fa0f2f59fe30b5296c0a3a4
+  data.tar.gz: 56b9be2ae99686aefa13e2de26b9c72bcd4a3eb82697ef2ec7b099252a2ce352
 SHA512:
-  metadata.gz: 16a3b6ed67de8ff550a59dc0b975d00a250698754a70fbef4e60546e1dc54a94d4d160d951a780a087b2b2a6aa83f36720531a063adb95b39e4154b1f06ab1c9
-  data.tar.gz: 536b1b2f86c94b0eaca1566d0f5d9cdd7a6ac0caf0cf82468b4296da26ed270c0a7e4a9526c29136e6ffe1398863290fc7f9b2e6cbb650aa88c7b46412b64186
+  metadata.gz: 9dc4c82dcc0fef0ee09cc838af7afd1065c5171ea5b3400a33c58e6aece35e0964b359e8a57a9f058cb4ee82741edafc5d6da14e9d8e566a13455c44a524f9a6
+  data.tar.gz: 4dae3e89d6bdc190fa10dde17fce93147f6c6f31ba636bb87d919cf78dbfc253dd10096e45e78f606230709bac50963a7e6c4b006203dc6386331f8209c1b425

data/definitions/features/foreman_server.rb

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

data/definitions/features/pulpcore.rb

@@ -3,13 +3,17 @@ 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
+      redis_services + feature(:apache).services
   end
 
   def configured_workers
@@ -21,6 +25,15 @@ 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',
@@ -29,9 +42,22 @@ 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/puppet/remove_puppet.rb

@@ -4,7 +4,7 @@ module Procedures::Puppet
       description 'Remove Puppet feature'
       confine do
         feature(:puppet_server) &&
-          (check_min_version('foreman', '3.0') || check_min_version('foreman-proxy', '3.0'))
+          (check_min_version('foreman', '3.6') || check_min_version('foreman-proxy', '3.6'))
       end
       advanced_run false
     end
@@ -42,7 +42,6 @@ module Procedures::Puppet
         options << '--foreman-proxy-puppet false'
         options << '--foreman-proxy-puppetca false'
       end
-      options << '--foreman-proxy-content-puppet false' if answers.key?('foreman_proxy_content')
       options
     end
 

data/definitions/scenarios/upgrade_to_capsule_6_13.rb

@@ -73,7 +73,6 @@ 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_capsule_6_14.rb

@@ -0,0 +1,92 @@
+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

@@ -0,0 +1,92 @@
+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_13.rb

@@ -76,7 +76,6 @@ 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/definitions/scenarios/upgrade_to_satellite_6_14.rb

@@ -0,0 +1,94 @@
+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

@@ -0,0 +1,93 @@
+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

data/lib/foreman_maintain/version.rb

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

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: foreman_maintain
 version: !ruby/object:Gem::Version
-  version: 1.2.10
+  version: 1.3.0
 platform: ruby
 authors:
 - Ivan Nečas
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2023-06-20 00:00:00.000000000 Z
+date: 2023-03-28 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: clamp
@@ -300,7 +300,6 @@ 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
@@ -355,6 +354,8 @@ 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,6 +370,8 @@ 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
@@ -497,7 +500,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.4.10
+rubygems_version: 3.2.33
 signing_key:
 specification_version: 4
 summary: Foreman maintenance tool belt

data/definitions/procedures/pulpcore/container_repair_media_type.rb

@@ -1,23 +0,0 @@
-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