foreman_maintain 0.8.21 → 0.8.22

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 34a580f07f36c4c9ab021f465d02b0430ac81a444765f2793a7940d18182ce25
-  data.tar.gz: ef70e629eec6f635d2515b9eea748567c2d3e559fc762a3005a0ab9a85d7e61b
+  metadata.gz: 197a1b9603612e47c37ae3a24fec9362d70eb50447144ea599b612571565ea3b
+  data.tar.gz: d100893294ab1e960e3e7f93cdca402ffbfc5f64c0f51d19f7aa074ee0b18b1a
 SHA512:
-  metadata.gz: '0797ffb2141b60a5811f62dcdddb2d600221c22df75868674a4628838a445836058b003d67296bc91a2bc4593f06dbe4bcd1223417263fb9335d4bb141dc8c14'
-  data.tar.gz: a40dd53e0d8633bd01301e2b85b2d38cf62d8ca0ab502c9c3747939d5a7b38f3fc90fc6b8f861ec956846660ab6ac0a22e2c257e3c07c3963fec945ee03cadde
+  metadata.gz: 72d0e0a9f785ea86cb69e7ef2b12c26d7e9ae3777347ec29780395bd32539e08e8c8344242a3c6974518a5ed4df03585b6817b0e08d9491aa8d0f87076ceb8aa
+  data.tar.gz: d7bcef48c7493525577c010f40079d33b3bcd834d370bbba2e298592562eff57acc79e8c0bb6eb80925bd15a28d13c39e827195fc1cd1a8a08a4f28c7d02a6df

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

@@ -1,3 +1,3 @@
 module ForemanMaintain
-  VERSION = '0.8.21'.freeze
+  VERSION = '0.8.22'.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.22
 platform: ruby
 authors:
 - Ivan Nečas
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2021-11-08 00:00:00.000000000 Z
+date: 2021-12-20 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
@@ -359,7 +360,6 @@ files:
 - 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 +387,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