foreman_maintain 0.8.21 → 0.8.24

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 34a580f07f36c4c9ab021f465d02b0430ac81a444765f2793a7940d18182ce25
-  data.tar.gz: ef70e629eec6f635d2515b9eea748567c2d3e559fc762a3005a0ab9a85d7e61b
+  metadata.gz: 164031605ab91a858e8051175df3cfa485cb8d7641495649b56fc369c8f86901
+  data.tar.gz: 34bff6ed46469b2de1f936c4b9fb9a292e56f3fbef6084c0f2d9f84d7d5a8389
 SHA512:
-  metadata.gz: '0797ffb2141b60a5811f62dcdddb2d600221c22df75868674a4628838a445836058b003d67296bc91a2bc4593f06dbe4bcd1223417263fb9335d4bb141dc8c14'
-  data.tar.gz: a40dd53e0d8633bd01301e2b85b2d38cf62d8ca0ab502c9c3747939d5a7b38f3fc90fc6b8f861ec956846660ab6ac0a22e2c257e3c07c3963fec945ee03cadde
+  metadata.gz: bcce432d5b166c898ecfa33e2a215c8dde59011c72a9f356a877c16caad70da945e06742b4bf867f70963d095ca5520f0fd7aea38893c8ea28a183f08f45ba3f
+  data.tar.gz: b88af64fe1462a21f0f53c42ae8d67fd940208ccb2234af5ad043fd0ac0121726aec6b215d6b5fbe7dd3c747f1b8aa5f797953cab1b757dd69c7c2c51656a084

data/definitions/checks/pulpcore/group_ownership_check.rb

@@ -0,0 +1,18 @@
+module Checks
+  module Pulpcore
+    class GroupOwnershipCheck < ForemanMaintain::Check
+      metadata do
+        description 'Check the group owner of /var/lib/pulp directory'
+        label :group_ownership_check_of_pulp_content
+        manual_detection
+      end
+
+      def run
+        group_id = File.stat('/var/lib/pulp/').gid
+        if Etc.getgrgid(group_id).name != 'pulp'
+          fail! "Please run 'foreman-maintain prep-6.10-upgrade' prior to upgrading."
+        end
+      end
+    end
+  end
+end

data/definitions/features/foreman_tasks.rb

@@ -88,6 +88,9 @@ class Features::ForemanTasks < ForemanMaintain::Feature
        DELETE FROM dynflow_actions USING foreman_tasks_tasks WHERE (foreman_tasks_tasks.external_id = dynflow_actions.execution_plan_uuid::varchar) AND #{tasks_condition};
        DELETE FROM dynflow_execution_plans USING foreman_tasks_tasks WHERE (foreman_tasks_tasks.external_id = dynflow_execution_plans.uuid::varchar) AND #{tasks_condition};
        DELETE FROM foreman_tasks_tasks WHERE #{tasks_condition};
+       -- Delete locks and links which may now be orphaned
+       DELETE FROM foreman_tasks_locks as ftl where ftl.id NOT IN (SELECT id FROM foreman_tasks_tasks);
+       DELETE FROM foreman_tasks_links as ftl where ftl.id NOT IN (SELECT id FROM foreman_tasks_tasks);
      COMMIT;
     SQL
 

data/definitions/features/system_repos.rb

@@ -21,6 +21,10 @@ class Features::SystemRepos < ForemanMaintain::Feature
     Hash[*repos.delete!(' ').split("\n")]
   end
 
+  def enabled_repos_ids
+    trim_repoids(enabled_repos_hash.keys)
+  end
+
   def upstream_repos_ids
     trim_repoids(upstream_repos.keys)
   end
@@ -29,6 +33,10 @@ class Features::SystemRepos < ForemanMaintain::Feature
     execute!("yum-config-manager --disable #{repo_ids.join(',')}")
   end
 
+  def enable_repos(repo_ids)
+    execute!("yum-config-manager --enable #{repo_ids.join(',')}")
+  end
+
   private
 
   def trim_repoids(repos)

data/definitions/procedures/pulp/remove.rb

@@ -86,6 +86,8 @@ module Procedures::Pulp
       drop_migrations
 
       delete_pulp_data(rm_cmds) if rm_cmds.any?
+
+      restart_pulpcore_services
     end
 
     def remove_pulp
@@ -168,5 +170,15 @@ module Procedures::Pulp
         spinner.update('Done deleting pulp2 data directories')
       end
     end
+
+    def restart_pulpcore_services
+      with_spinner('Restarting pulpcore services') do |spinner|
+        pulp_services = feature(:pulpcore).services
+
+        feature(:service).handle_services(spinner, 'stop', :only => pulp_services)
+        feature(:service).handle_services(spinner, 'start', :only => pulp_services)
+        spinner.update('Done restarting pulpcore services')
+      end
+    end
   end
 end

data/definitions/procedures/repositories/backup_enabled_repos.rb

@@ -0,0 +1,16 @@
+module Procedures::Repositories
+  class BackupEnabledRepos < ForemanMaintain::Procedure
+    metadata do
+      label :backup_enabled_repos
+      description 'Stores enabled repositories in yaml file'
+    end
+
+    def run
+      enabled_repos_ids = feature(:system_repos).enabled_repos_ids
+      unless enabled_repos_ids.empty?
+        backup_dir = File.expand_path(ForemanMaintain.config.backup_dir)
+        File.write(File.join(backup_dir, 'enabled_repos.yml'), enabled_repos_ids.to_yaml)
+      end
+    end
+  end
+end

data/definitions/procedures/repositories/enable.rb

@@ -0,0 +1,13 @@
+module Procedures::Repositories
+  class Enable < ForemanMaintain::Procedure
+    metadata do
+      param :repos, 'List of repositories to enable'
+      description 'Enable repositories'
+    end
+    def run
+      with_spinner('Enabling repositories') do
+        feature(:system_repos).enable_repos(@repos)
+      end
+    end
+  end
+end

data/definitions/scenarios/self_upgrade.rb

@@ -0,0 +1,102 @@
+module ForemanMaintain::Scenarios
+  class SelfUpgradeBase < ForemanMaintain::Scenario
+    def enabled_system_repos_id
+      feature(:system_repos).enabled_repos_ids
+    end
+
+    def enable_repos(repo_ids = stored_enabled_repos_ids)
+      add_step(Procedures::Repositories::Enable.new(repos: repo_ids))
+    end
+
+    def disable_repos(repo_ids = stored_enabled_repos_ids)
+      add_step(Procedures::Repositories::Disable.new(repos: repo_ids))
+    end
+
+    def target_version
+      @target_version ||= context.get(:target_version)
+    end
+
+    def current_version
+      feature(:instance).downstream.current_minor_version
+    end
+
+    def maintenance_repo_id(version)
+      if (repo = ENV['maintenance_repo'])
+        return repo unless repo.empty?
+      end
+
+      maintenance_repo(version)
+    end
+
+    def maintenance_repo(version)
+      if el7?
+        "rhel-#{el_major_version}-server-satellite-maintenance-#{version}-rpms"
+      else
+        "satellite-maintenance-#{version}-for-rhel-#{el_major_version}-x86_64-rpms"
+      end
+    end
+
+    def maintenance_repo_version
+      return '6' if current_version == '6.10'
+
+      current_version
+    end
+
+    def stored_enabled_repos_ids
+      @stored_enabled_repos_ids ||= begin
+        path = File.expand_path('enabled_repos.yml', ForemanMaintain.config.backup_dir)
+        @stored_enabled_repos_ids = File.file?(path) ? YAML.load(File.read(path)) : []
+      end
+    end
+
+    def all_maintenance_repos
+      repo_regex = if el7?
+                     /rhel-\d-server-satellite-maintenance-\d.\d-rpms/
+                   else
+                     /satellite-maintenance-\d.\d-for-rhel-\d-x86_64-rpms/
+                   end
+      stored_enabled_repos_ids.select { |id| !id.match(repo_regex).nil? }
+    end
+
+    def repos_ids_to_reenable
+      repos_ids_to_reenable = stored_enabled_repos_ids - all_maintenance_repos
+      repos_ids_to_reenable << maintenance_repo(maintenance_repo_version)
+    end
+  end
+
+  class SelfUpgrade < SelfUpgradeBase
+    metadata do
+      label :self_upgrade_foreman_maintain
+      description "Enables the specified version's maintenance repository and,"\
+  								"\nupdates the satellite-maintain packages"
+      manual_detection
+    end
+
+    def compose
+      if check_min_version('foreman', '2.5') || check_min_version('foreman-proxy', '2.5')
+        pkgs_to_update = %w[satellite-maintain rubygem-foreman_maintain]
+        add_step(Procedures::Repositories::BackupEnabledRepos.new)
+        disable_repos
+        add_step(Procedures::Repositories::Enable.new(repos: [maintenance_repo_id(target_version)]))
+        add_step(Procedures::Packages::Update.new(packages: pkgs_to_update, assumeyes: true))
+        enable_repos(repos_ids_to_reenable)
+      end
+    end
+  end
+
+  class SelfUpgradeRescue < SelfUpgradeBase
+    metadata do
+      label :rescue_self_upgrade
+      description 'Disables all version specific maintenance repositories and,'\
+  		 "\nenables the repositories which were configured prior to self upgrade"
+      manual_detection
+      run_strategy :fail_slow
+    end
+
+    def compose
+      if check_min_version('foreman', '2.5') || check_min_version('foreman-proxy', '2.5')
+        enable_repos(repos_ids_to_reenable)
+      end
+    end
+  end
+end

data/definitions/scenarios/upgrade_to_satellite_6_10.rb

@@ -25,6 +25,7 @@ module Scenarios::Satellite_6_10
     end
 
     def compose
+      add_step(Checks::Pulpcore::GroupOwnershipCheck)
       add_step(Checks::Puppet::WarnAboutPuppetRemoval)
       add_step(Checks::CheckForNewerPackages.new(:packages => [foreman_plugin_name('katello'),
                                                                'python3-pulp-2to3-migration'],
@@ -61,13 +62,6 @@ module Scenarios::Satellite_6_10
       context.map(:assumeyes, Procedures::Installer::Upgrade => :assumeyes)
     end
 
-    def check_var_lib_pulp
-      group_id = File.stat('/var/lib/pulp/').gid
-      if Etc.getgrgid(group_id).name != 'pulp'
-        raise "Please run 'foreman-maintain prep-6.10-upgrade' prior to upgrading."
-      end
-    end
-
     def pulp3_switchover_steps
       add_step(Procedures::Service::Enable.
           new(:only => Features::Pulpcore.pulpcore_migration_services))
@@ -79,7 +73,6 @@ module Scenarios::Satellite_6_10
     end
 
     def compose
-      check_var_lib_pulp
       unless check_min_version(foreman_plugin_name('katello'), '4.0')
         pulp3_switchover_steps
       end

data/lib/foreman_maintain/cli/self_upgrade_command.rb

@@ -0,0 +1,39 @@
+module ForemanMaintain
+  module Cli
+    class SelfUpgradeCommand < Base
+      option ['--target-version'], 'TARGET_VERSION',\
+             'Major version of the Satellite or Capsule'\
+           	', e.g 7.0', :required => true
+      def execute
+        allow_major_version_upgrade_only
+        run_scenario(upgrade_scenario, upgrade_rescue_scenario)
+      end
+
+      def upgrade_scenario
+        Scenarios::SelfUpgrade.new(target_version: target_version)
+      end
+
+      def upgrade_rescue_scenario
+        Scenarios::SelfUpgradeRescue.new(target_version: target_version)
+      end
+
+      def current_downstream_version
+        ForemanMaintain.detector.feature(:instance).downstream.current_version
+      end
+
+      def allow_major_version_upgrade_only
+        begin
+          next_version = Gem::Version.new(target_version)
+        rescue ArgumentError => err
+          raise Error::UsageError, "Invalid version! #{err}"
+        end
+        if current_downstream_version >= next_version
+          message = "The target-version #{target_version} should be "\
+                    "greater than existing version #{current_downstream_version},"\
+                    "\nand self-upgrade should be used for major version upgrades only!"
+          raise Error::UsageError, message
+        end
+      end
+    end
+  end
+end

data/lib/foreman_maintain/cli.rb

@@ -11,6 +11,7 @@ require 'foreman_maintain/cli/restore_command'
 require 'foreman_maintain/cli/maintenance_mode_command'
 require 'foreman_maintain/cli/packages_command'
 require 'foreman_maintain/cli/content_command'
+require 'foreman_maintain/cli/self_upgrade_command'
 
 module ForemanMaintain
   module Cli
@@ -25,6 +26,7 @@ module ForemanMaintain
       subcommand 'packages', 'Lock/Unlock package protection, install, update', PackagesCommand
       subcommand 'advanced', 'Advanced tools for server maintenance', AdvancedCommand
       subcommand 'content', 'Content related commands', ContentCommand
+      subcommand 'self-upgrade', 'Perform major version self upgrade', SelfUpgradeCommand
       subcommand 'maintenance-mode', 'Control maintenance-mode for application',
                  MaintenanceModeCommand
       if ForemanMaintain.detector.feature(:satellite) &&

data/lib/foreman_maintain/version.rb

@@ -1,3 +1,3 @@
 module ForemanMaintain
-  VERSION = '0.8.21'.freeze
+  VERSION = '0.8.24'.freeze
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: foreman_maintain
 version: !ruby/object:Gem::Version
-  version: 0.8.21
+  version: 0.8.24
 platform: ruby
 authors:
 - Ivan Nečas
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2021-11-08 00:00:00.000000000 Z
+date: 2022-03-09 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: clamp
@@ -154,6 +154,7 @@ files:
 - definitions/checks/original_assets.rb
 - definitions/checks/package_manager/yum/validate_yum_config.rb
 - definitions/checks/pulpcore/db_up.rb
+- definitions/checks/pulpcore/group_ownership_check.rb
 - definitions/checks/puppet/provide_upgrade_guide.rb
 - definitions/checks/puppet/verify_no_empty_cacert_requests.rb
 - definitions/checks/puppet/warn_about_puppet_removal.rb
@@ -273,7 +274,9 @@ files:
 - definitions/procedures/puppet/delete_empty_ca_cert_request_files.rb
 - definitions/procedures/refresh_features.rb
 - definitions/procedures/remote_execution/remove_existing_settingsd.rb
+- definitions/procedures/repositories/backup_enabled_repos.rb
 - definitions/procedures/repositories/disable.rb
+- definitions/procedures/repositories/enable.rb
 - definitions/procedures/repositories/setup.rb
 - definitions/procedures/restore/candlepin_dump.rb
 - definitions/procedures/restore/configs.rb
@@ -306,6 +309,7 @@ files:
 - definitions/scenarios/packages.rb
 - definitions/scenarios/prep_6_10_upgrade.rb
 - definitions/scenarios/restore.rb
+- definitions/scenarios/self_upgrade.rb
 - definitions/scenarios/services.rb
 - definitions/scenarios/upgrade_to_capsule_6_10.rb
 - definitions/scenarios/upgrade_to_capsule_6_10_z.rb
@@ -353,13 +357,13 @@ files:
 - lib/foreman_maintain/cli/maintenance_mode_command.rb
 - lib/foreman_maintain/cli/packages_command.rb
 - lib/foreman_maintain/cli/restore_command.rb
+- lib/foreman_maintain/cli/self_upgrade_command.rb
 - lib/foreman_maintain/cli/service_command.rb
 - lib/foreman_maintain/cli/transform_clamp_options.rb
 - lib/foreman_maintain/cli/upgrade_command.rb
 - lib/foreman_maintain/concerns/base_database.rb
 - lib/foreman_maintain/concerns/directory_marker.rb
 - lib/foreman_maintain/concerns/downstream.rb
-- lib/foreman_maintain/concerns/el_repos_manager_common.rb
 - lib/foreman_maintain/concerns/finders.rb
 - lib/foreman_maintain/concerns/hammer.rb
 - lib/foreman_maintain/concerns/logger.rb
@@ -387,9 +391,6 @@ files:
 - lib/foreman_maintain/procedure.rb
 - lib/foreman_maintain/reporter.rb
 - lib/foreman_maintain/reporter/cli_reporter.rb
-- lib/foreman_maintain/repos_manager/dnf_config_manager.rb
-- lib/foreman_maintain/repos_manager/el_common.rb
-- lib/foreman_maintain/repos_manager/yum_config_manager.rb
 - lib/foreman_maintain/runner.rb
 - lib/foreman_maintain/runner/execution.rb
 - lib/foreman_maintain/runner/stored_execution.rb

data/lib/foreman_maintain/concerns/el_repos_manager_common.rb

@@ -1,20 +0,0 @@
-module ForemanMaintain
-  module Concerns
-    module ElReposManagerCommon
-    include ForemanMaintain::Concerns::OsFacts
-
-    	def package_manager
-    		return 'dnf' if el8?
-
-    		'yum'
-    	end
-
-     	def enabled_repos_hash
-        repos = execute("#{package_manager} repolist enabled -d 6 -e 0 2> /dev/null | grep -E 'Repo-id|Repo-baseurl'")
-    	  return {} if repos.empty?
-
-    	  Hash[*repos.delete!(' ').split("\n")]
-  	  end
-    end
-  end
-end

data/lib/foreman_maintain/repos_manager/dnf_config_manager.rb

@@ -1,13 +0,0 @@
-module ForemanMaintain::ReposManager
-	class DnfConfigManager
-		include ForemanMaintain::Concerns::ElReposManagerCommon
-
-    def disable_repos(repo_ids)
-      execute!("dnf config-manager --set-disabled #{repo_ids.join(',')}")
-    end
-    
-    def enable_repos(repo_ids)
-      execute!("dnf config-manager --set-enabled #{repo_ids.join(',')}")
-    end
-	end
-end

data/lib/foreman_maintain/repos_manager/yum_config_manager.rb

@@ -1,20 +0,0 @@
-module ForemanMaintain::ReposManager
-	class YumConfigManager
-		include ForemanMaintain::Concerns::ElReposManagerCommon
-		
-		def disable_repos(repo_ids)
-      execute!("yum-config-manager --disable #{repo_ids.join(',')}")
-    end
-
-    def enable_repos(repo_ids)
-      execute!("yum-config-manager --enable #{repo_ids.join(',')}")
-    end
-
-    def enabled_repos_hash
-    	repos = execute("yum repolist enabled -d 6 -e 0 2> /dev/null | grep -E 'Repo-id|Repo-baseurl'")
-    	return {} if repos.empty?
-
-    	Hash[*repos.delete!(' ').split("\n")]
-  	end
-	end
-end