foreman_maintain 1.0.13 → 1.0.16

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: c6b379bdb79107fc7f416af7bf700834ec7ae0591b734926398a09311d86879e
-  data.tar.gz: bf901e325a757e8e5c31787019dd9ba662bedef4a5692f20d78f4204f45bbcc4
+  metadata.gz: 0daf3332063c9ae83f36cd69d2ddd6608ac10fd14b2cb0c2391210ddd332af80
+  data.tar.gz: 68fcc2ea5a4196afe431ebebec41a66e9c6ed72bf9f7f7e9f123993139dc7257
 SHA512:
-  metadata.gz: 49831252dbbb12f0dc9f6e591d24aa9cb112e9dacfe50470c5ef9cb1a5c6a4f5e7070b95a0929f970dfcb7430ffad4cffce74f6cbd1c8f28231e26411cc42886
-  data.tar.gz: e0173b351c72f65b1d17cca48c31a7b3896781c8a2af6d07a23c25593318ed1f548f73a54e8ece99b8ced0ff6fb0828f6d850bde95a9de07950c03a433861987
+  metadata.gz: 8e4ad682218a2efdaf3e205974db79ada30359f37aaca377d4485fe474bc0bda9080692890753dec1bd6ed8bd176c7a48a5646be2d77c362bab1f4072f7e5f43
+  data.tar.gz: a9ba1078902c5061bc5f1900dbfec456b1eadcdf13c986efb1bea6a0cd1daa12c06b9dfc6310d3e67dfc1c256fee39d57aabdda58ae899b29729b738fbc7bfe5

data/definitions/procedures/pulp/remove.rb

@@ -24,7 +24,15 @@ module Procedures::Pulp
         '/var/lib/pulp/uploads',
         '/var/lib/mongodb/',
         '/var/cache/pulp'
-      ]
+      ].select { |dir| File.directory?(dir) }
+    end
+
+    def pulp_data_dirs_mountpoints
+      pulp_data_dirs.select { |d| Pathname(d).mountpoint? }
+    end
+
+    def deletable_pulp_dirs
+      @deletable_pulp_dirs ||= pulp_data_dirs - pulp_data_dirs_mountpoints
     end
 
     # rubocop:disable  Metrics/MethodLength
@@ -53,11 +61,12 @@ module Procedures::Pulp
       @installed_pulp_packages
     end
 
-    def data_dir_removal_cmds
-      pulp_data_dirs.select { |dir| File.directory?(dir) }.map { |dir| "rm -rf #{dir}" }
+    def data_dir_removal_cmds(pulp_dirs)
+      pulp_dirs.map { |dir| "rm -rf #{dir}" }
     end
 
-    def ask_to_proceed(rm_cmds)
+    def ask_to_proceed
+      rm_cmds = data_dir_removal_cmds(pulp_data_dirs)
       question = "\nWARNING: All pulp2 packages will be removed with the following commands:\n"
       question += "\n# rpm -e #{pulp_packages.join('  ')}" if pulp_packages.any?
       question += "\n# yum remove rh-mongodb34-*"
@@ -70,11 +79,9 @@ module Procedures::Pulp
     end
 
     def run
-      rm_cmds = data_dir_removal_cmds
-
       assumeyes_val = @assumeyes.nil? ? assumeyes? : @assumeyes
 
-      ask_to_proceed(rm_cmds) unless assumeyes_val
+      ask_to_proceed unless assumeyes_val
 
       remove_pulp if pulp_packages.any?
 
@@ -86,7 +93,7 @@ module Procedures::Pulp
 
       drop_migrations
 
-      delete_pulp_data(rm_cmds) if rm_cmds.any?
+      delete_pulp_data
 
       restart_pulpcore_services
     end
@@ -163,12 +170,41 @@ module Procedures::Pulp
     end
     # rubocop:enable Metrics/BlockLength
 
-    def delete_pulp_data(rm_cmds)
-      with_spinner('Deleting pulp2 data directories') do |spinner|
-        rm_cmds.each do |cmd|
-          execute!(cmd)
+    def delete_pulp_data
+      non_mountpoints = data_dir_removal_cmds(deletable_pulp_dirs)
+      mountpoints = pulp_data_dirs_mountpoints
+      with_spinner('') do |spinner|
+        if non_mountpoints.any?
+          spinner.update('Deleting pulp2 data directories.')
+          non_mountpoints.each do |cmd|
+            execute!(cmd)
+          end
+          msg_for_del_non_mountpoints(mountpoints, spinner)
+        end
+        if mountpoints.any?
+          msg_for_del_mountpoints(mountpoints, spinner)
         end
-        spinner.update('Done deleting pulp2 data directories')
+      end
+    end
+
+    def msg_for_del_non_mountpoints(mountpoints, spinner)
+      if mountpoints.empty?
+        spinner.update('Done deleting all pulp2 data directories.')
+      else
+        spinner.update("Deleted: #{deletable_pulp_dirs.join("\n")}")
+      end
+    end
+
+    def msg_for_del_mountpoints(mountpoints, spinner)
+      _, cmd_name = ForemanMaintain.pkg_and_cmd_name
+      if mountpoints.count > 1
+        spinner.update("The directories #{mountpoints.join(',')} are individual mountpoints.")
+        puts  "\nThe #{cmd_name} won't delete these directories.\n"\
+              'You need to remove content and these directories on your own.'
+      else
+        spinner.update("The directory #{mountpoints.join(',')} is individual mountpoint.")
+        puts  "\nThe #{cmd_name} won't delete the directory.\n"\
+              'You need to remove content and the directory on your own.'
       end
     end
 

data/definitions/scenarios/self_upgrade.rb

@@ -43,7 +43,11 @@ module ForemanMaintain::Scenarios
     end
 
     def req_repos_to_update_pkgs
-      main_rh_repos + [maintenance_repo_id(target_version)]
+      if use_rhsm?
+        main_rh_repos + [maintenance_repo_id(target_version)]
+      else
+        [maintenance_repo_id(target_version)]
+      end
     end
   end
 

data/definitions/scenarios/upgrade_to_capsule_6_11.rb

@@ -40,6 +40,7 @@ module Scenarios::Capsule_6_11
     def compose
       add_steps(find_procedures(:pre_migrations))
       add_step(Procedures::Pulp::Remove.new(:assumeyes => true))
+      add_step(Procedures::Content::FixPulpcoreArtifactOwnership.new(:assumeyes => true))
       add_step(Procedures::Service::Stop.new)
     end
   end

data/definitions/scenarios/upgrade_to_capsule_6_11_z.rb

@@ -39,6 +39,7 @@ module Scenarios::Capsule_6_11_z
 
     def compose
       add_steps(find_procedures(:pre_migrations))
+      add_step(Procedures::Content::FixPulpcoreArtifactOwnership.new(:assumeyes => true))
       add_step(Procedures::Service::Stop.new)
     end
   end

data/definitions/scenarios/upgrade_to_satellite_6_11.rb

@@ -42,6 +42,7 @@ module Scenarios::Satellite_6_11
     def compose
       add_steps(find_procedures(:pre_migrations))
       add_step(Procedures::Pulp::Remove.new(:assumeyes => true))
+      add_step(Procedures::Content::FixPulpcoreArtifactOwnership.new(:assumeyes => true))
       add_step(Procedures::Service::Stop.new)
     end
   end

data/definitions/scenarios/upgrade_to_satellite_6_11_z.rb

@@ -39,6 +39,7 @@ module Scenarios::Satellite_6_11_z
 
     def compose
       add_steps(find_procedures(:pre_migrations))
+      add_step(Procedures::Content::FixPulpcoreArtifactOwnership.new(:assumeyes => true))
       add_step(Procedures::Service::Stop.new)
     end
   end

data/lib/foreman_maintain/version.rb

@@ -1,3 +1,3 @@
 module ForemanMaintain
-  VERSION = '1.0.13'.freeze
+  VERSION = '1.0.16'.freeze
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: foreman_maintain
 version: !ruby/object:Gem::Version
-  version: 1.0.13
+  version: 1.0.16
 platform: ruby
 authors:
 - Ivan Nečas
-autorequire: 
+autorequire:
 bindir: bin
 cert_chain: []
-date: 2022-07-08 00:00:00.000000000 Z
+date: 2022-09-06 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: clamp
@@ -453,7 +453,7 @@ homepage: https://github.com/theforeman/foreman_maintain
 licenses:
 - GPL-3.0
 metadata: {}
-post_install_message: 
+post_install_message:
 rdoc_options: []
 require_paths:
 - lib
@@ -468,8 +468,8 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.0.9
-signing_key: 
+rubygems_version: 3.3.7
+signing_key:
 specification_version: 4
 summary: Foreman maintenance tool belt
 test_files: []