foreman_maintain 0.8.6 → 0.8.7

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: e5d17c606d64e5edab8bcbf3b37d54c08b2930def998f3cb963b0a8e84ee3d81
-  data.tar.gz: c83587b88d96cc21347fd863205cefa7228471ac4d9e2d020a01f49869ddff0a
+  metadata.gz: ba12e565c1d9d7ef2121f766d68231fd287364dbd3f5feb20bb21623fcb046f1
+  data.tar.gz: 70d982478fc721efa83ace6be2544afee4438a826eac4991ba42bf68627e252e
 SHA512:
-  metadata.gz: 256b2868145fcca0b1c1a9df5b37a1d0f1ee5adf4345df8e13bf6ed38f9e03de7832f9d8873a24f900c11a75f18029ce56a473d4de25fa17c2af1f370b6f6a0b
-  data.tar.gz: a7e636e968d2457fdc2f09124f6976c872b639467d8993f629959b163a2e380e0e86bdc89bd8129848f72f2b1a6e47972cddffad72f4a5b472b555d96bc46fab
+  metadata.gz: 46ca4a2c64ad3228b85e57e319e9e39413616cea7ba5503206d398c5e921d33d8d796ceb1741865cde4c0229b9729dfabae4b80d3765d822298a4502266063ef
+  data.tar.gz: 7b0a7a51038947db2860e537402c6ccc87f0ea24b01ad051c8dd6a63c6601aea7295a2634ba1fa72cde23ee28d4c5ef56b7981e3ef93bac286b6bbf64c7cf3b0

data/definitions/features/service.rb

@@ -45,7 +45,7 @@ class Features::Service < ForemanMaintain::Feature
 
   def filter_disabled_services!(action, service_list)
     if %w[start stop restart status].include?(action)
-      service_list.select!(&:enabled?)
+      service_list.select! { |service| !service.respond_to?(:enabled?) || service.enabled? }
     end
     service_list
   end

data/definitions/procedures/content/prepare.rb

@@ -6,6 +6,7 @@ module Procedures::Content
     end
 
     def run
+      sleep(20) # in satellite 6.9 the services are still coming up
       # use interactive to get realtime output
       puts execute!('foreman-rake katello:pulp3_migration', :interactive => true)
     end

data/definitions/procedures/content/switchover.rb

@@ -8,8 +8,11 @@ module Procedures::Content
         # FIXME: remove this condition for the 6.10 upgrade scenario
         !feature(:instance).downstream
       end
+
+      param :skip_deb, 'Do not run debian options in installer.'
     end
 
+    # rubocop:disable Metrics/MethodLength
     def run
       puts 'Performing final content migration before switching content'
       puts execute!('foreman-rake katello:pulp3_migration')
@@ -20,11 +23,15 @@ module Procedures::Content
       puts 'Re-running the installer to switch specified content over to pulp3'
       args = ['--foreman-proxy-content-proxy-pulp-isos-to-pulpcore=true',
               '--foreman-proxy-content-proxy-pulp-yum-to-pulpcore=true',
-              '--foreman-proxy-content-proxy-pulp-deb-to-pulpcore=true',
               '--katello-use-pulp-2-for-file=false',
               '--katello-use-pulp-2-for-docker=false',
-              '--katello-use-pulp-2-for-deb=false',
               '--katello-use-pulp-2-for-yum=false']
+
+      unless @skip_deb
+        args += ['--katello-use-pulp-2-for-deb=false',
+                 '--foreman-proxy-content-proxy-pulp-deb-to-pulpcore=true']
+      end
+
       feature(:installer).run(args.join(' '))
     end
   end

data/definitions/procedures/packages/check_update.rb

@@ -0,0 +1,11 @@
+module Procedures::Packages
+  class CheckUpdate < ForemanMaintain::Procedure
+    metadata do
+      description 'Check for available package updates'
+    end
+
+    def run
+      puts package_manager.check_update
+    end
+  end
+end

data/definitions/procedures/pulp/print_remove_instructions.rb

@@ -0,0 +1,16 @@
+module Procedures::Pulp
+  class PrintRemoveInstructions < ForemanMaintain::Procedure
+    metadata do
+      description 'Print pulp 2 removal instructions'
+    end
+
+    def run
+      puts '======================================================'
+      puts 'Migration of content from Pulp 2 to Pulp3 is complete'
+      puts 'After verifying accessibility of content from clients,'
+      puts 'it is strongly recommend to run "foreman-maintain content remove-pulp2"'
+      puts 'This will remove Pulp 2, MongoDB, and all pulp2 content in /var/lib/pulp/content/'
+      puts '======================================================'
+    end
+  end
+end

data/definitions/procedures/pulp/remove.rb

@@ -2,10 +2,13 @@ module Procedures::Pulp
   class Remove < ForemanMaintain::Procedure
     metadata do
       description 'Remove pulp2'
+      param :assumeyes, 'Do not ask for confirmation', :default => false
 
       confine do
         check_min_version('katello-common', '4.0')
       end
+
+      param :assume_yes, 'Run the full removal without asking.'
     end
 
     def sys
@@ -41,7 +44,8 @@ module Procedures::Pulp
                     python-pulp-python-common python-pulp-repoauth python-pulp-rpm-common
                     python-pulp-streamer python-pymongo python-pymongo-gridfs python2-amqp
                     python2-billiard python2-celery python2-debpkgr python2-django python2-kombu
-                    python2-solv python2-vine pulp-katello]
+                    python2-solv python2-vine pulp-katello pulp-maintenance
+                    python3-pulp-2to3-migration]
 
       @installed_pulp_packages ||= possible.select { |pkg| find_package(pkg) }
       @installed_pulp_packages
@@ -52,9 +56,9 @@ module Procedures::Pulp
     end
 
     def ask_to_proceed(rm_cmds)
-      question = "\nWARNING: All pulp2 packages will be removed with the following commands:\n" \
-        "\n# rpm -e #{pulp_packages.join('  ')}" \
-        "\n# yum remove rh-mongodb34-*" \
+      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-*" \
         "\n\nAll pulp2 data will be removed.\n"
       question += rm_cmds.collect { |cmd| "\n# #{cmd}" }.join
       question += "\n\nDo you want to proceed?"
@@ -64,12 +68,19 @@ module Procedures::Pulp
 
     def run
       rm_cmds = data_dir_removal_cmds
-      ask_to_proceed(rm_cmds) if rm_cmds.any?
 
-      remove_pulp
+      assumeyes_val = @assumeyes.nil? ? assumeyes? : @assumeyes
+
+      ask_to_proceed(rm_cmds) unless assumeyes_val
+
+      remove_pulp if pulp_packages.any?
 
       remove_mongo
 
+      drop_migration_tables
+
+      drop_migrations
+
       delete_pulp_data(rm_cmds) if rm_cmds.any?
     end
 
@@ -85,6 +96,60 @@ module Procedures::Pulp
       end
     end
 
+    def drop_migration_tables
+      with_spinner('Dropping migration tables') do
+        feature(:pulpcore_database).psql(<<-SQL)
+          BEGIN;
+          DROP TABLE IF EXISTS pulp_2to3_migration_migrationplan,
+            pulp_2to3_migration_pulp2blob,
+            pulp_2to3_migration_pulp2content,
+            pulp_2to3_migration_pulp2debcomponent,
+            pulp_2to3_migration_pulp2debcomponentpackage,
+            pulp_2to3_migration_pulp2debpackage,
+            pulp_2to3_migration_pulp2debrelease,
+            pulp_2to3_migration_pulp2debreleasearchitecture,
+            pulp_2to3_migration_pulp2distribution,
+            pulp_2to3_migration_pulp2distributor,
+            pulp_2to3_migration_pulp2distributor_pulp2_repos,
+            pulp_2to3_migration_pulp2erratum,
+            pulp_2to3_migration_pulp2importer,
+            pulp_2to3_migration_pulp2iso,
+            pulp_2to3_migration_pulp2lazycatalog,
+            pulp_2to3_migration_pulp2manifest,
+            pulp_2to3_migration_pulp2manifestlist,
+            pulp_2to3_migration_pulp2modulemd,
+            pulp_2to3_migration_pulp2modulemddefaults,
+            pulp_2to3_migration_pulp2packagecategory,
+            pulp_2to3_migration_pulp2packageenvironment,
+            pulp_2to3_migration_pulp2packagegroup,
+            pulp_2to3_migration_pulp2packagelangpacks,
+            pulp_2to3_migration_pulp2repocontent,
+            pulp_2to3_migration_pulp2repository,
+            pulp_2to3_migration_pulp2rpm,
+            pulp_2to3_migration_pulp2srpm,
+            pulp_2to3_migration_pulp2tag,
+            pulp_2to3_migration_pulp2yumrepometadatafile,
+            pulp_2to3_migration_reposetup CASCADE;
+          DROP SEQUENCE IF EXISTS pulp_2to3_migration_pulp2distributor_pulp2_repos_id_seq;
+          END;
+        SQL
+      end
+    end
+
+    def drop_migrations
+      with_spinner('Dropping migrations') do
+        feature(:pulpcore_database).psql(<<-SQL)
+          BEGIN;
+          DELETE FROM django_migrations WHERE app = 'pulp_2to3_migration';
+          DELETE FROM auth_permission WHERE content_type_id in (SELECT id FROM django_content_type WHERE app_label = 'pulp_2to3_migration');
+          DELETE FROM django_admin_log WHERE content_type_id in (SELECT id FROM django_content_type WHERE app_label = 'pulp_2to3_migration');
+          DELETE FROM django_content_type WHERE app_label = 'pulp_2to3_migration';
+          END;
+        SQL
+      end
+    end
+    # rubocop:enable Metrics/BlockLength
+
     def delete_pulp_data(rm_cmds)
       with_spinner('Deleting pulp2 data directories') do |spinner|
         rm_cmds.each do |cmd|

data/definitions/scenarios/content.rb

@@ -101,9 +101,14 @@ module ForemanMaintain::Scenarios
       metadata do
         label :content_remove_pulp2
         description 'Remove Pulp2 and mongodb packages and data'
+        param :assumeyes, 'Do not ask for confirmation'
         manual_detection
       end
 
+      def set_context_mapping
+        context.map(:assumeyes, Procedures::Pulp::Remove => :assumeyes)
+      end
+
       def compose
         add_step_with_context(Procedures::Pulp::Remove)
       end

data/definitions/scenarios/packages.rb

@@ -50,6 +50,18 @@ module ForemanMaintain::Scenarios
       end
     end
 
+    class CheckUpdate < ForemanMaintain::Scenario
+      metadata do
+        label :packages_check_update
+        description 'Check for available package updates'
+        manual_detection
+      end
+
+      def compose
+        add_step(Procedures::Packages::CheckUpdate)
+      end
+    end
+
     class Install < ForemanMaintain::Scenario
       metadata do
         description 'install packages in unlocked session'

data/definitions/scenarios/upgrade_to_satellite_6_10.rb

@@ -48,13 +48,29 @@ module Scenarios::Satellite_6_10
     upgrade_metadata do
       description 'Migration scripts to Satellite 6.10'
       tags :migrations
+      run_strategy :fail_fast
     end
 
     def set_context_mapping
       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 compose
+      check_var_lib_pulp
+
+      add_step(Procedures::Service::Start)
+      add_step(Procedures::Service::Enable.
+          new(:only => Features::Pulpcore.pulpcore_migration_services))
+      add_step(Procedures::Service::Start.
+          new(:only => Features::Pulpcore.pulpcore_migration_services))
+      add_step(Procedures::Content::Switchover.new(:skip_deb => true))
       add_step(Procedures::Repositories::Setup.new(:version => '6.10'))
       add_step(Procedures::Packages::UnlockVersions.new)
       add_step(Procedures::Packages::Update.new(:assumeyes => true))
@@ -86,6 +102,7 @@ module Scenarios::Satellite_6_10
     def compose
       add_steps(find_checks(:default))
       add_steps(find_checks(:post_upgrade))
+      add_step(Procedures::Pulp::PrintRemoveInstructions.new)
     end
   end
 end

data/lib/foreman_maintain/cli/content_command.rb

@@ -35,8 +35,11 @@ module ForemanMaintain
       end
 
       subcommand 'remove-pulp2', 'Remove pulp2 and mongodb packages and data' do
+        interactive_option(%w[assumeyes plaintext])
         def execute
-          run_scenarios_and_exit(Scenarios::Content::RemovePulp2.new)
+          run_scenarios_and_exit(
+            Scenarios::Content::RemovePulp2.new(:assumeyes => assumeyes?)
+          )
         end
       end
     end

data/lib/foreman_maintain/cli/packages_command.rb

@@ -22,6 +22,13 @@ module ForemanMaintain
         end
       end
 
+      subcommand 'check-update', 'Check for available package updates' do
+        interactive_option
+        def execute
+          run_scenarios_and_exit(Scenarios::Packages::CheckUpdate.new)
+        end
+      end
+
       subcommand 'install', 'Install packages in an unlocked session' do
         interactive_option(['assumeyes'])
         parameter 'PACKAGES ...', 'packages to install', :attribute_name => :packages

data/lib/foreman_maintain/package_manager/yum.rb

@@ -61,6 +61,10 @@ module ForemanMaintain::PackageManager
       yum_action('clean', 'all', :assumeyes => assumeyes)
     end
 
+    def check_update
+      yum_action('check-update', nil, :assumeyes => true, :valid_exit_statuses => [100])
+    end
+
     def update_available?(package)
       cmd_output = yum_action('check-update -q', package, :with_status => true, :assumeyes => false)
       cmd_output[0] == 100
@@ -109,10 +113,11 @@ module ForemanMaintain::PackageManager
       File.open(protector_config_file, 'w') { |file| file.puts config }
     end
 
-    def yum_action(action, packages, with_status: false, assumeyes: false)
+    def yum_action(action, packages, with_status: false, assumeyes: false, valid_exit_statuses: [0])
       yum_options = []
       packages = [packages].flatten(1)
       yum_options << '-y' if assumeyes
+      yum_options << '--disableplugin=foreman-protector'
       yum_options_s = yum_options.empty? ? '' : ' ' + yum_options.join(' ')
       packages_s = packages.empty? ? '' : ' ' + packages.join(' ')
       if with_status
@@ -120,7 +125,7 @@ module ForemanMaintain::PackageManager
                                 :interactive => !assumeyes)
       else
         sys.execute!("yum#{yum_options_s} #{action}#{packages_s}",
-                     :interactive => !assumeyes)
+                     :interactive => !assumeyes, :valid_exit_statuses => valid_exit_statuses)
       end
     end
 

data/lib/foreman_maintain/version.rb

@@ -1,3 +1,3 @@
 module ForemanMaintain
-  VERSION = '0.8.6'.freeze
+  VERSION = '0.8.7'.freeze
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: foreman_maintain
 version: !ruby/object:Gem::Version
-  version: 0.8.6
+  version: 0.8.7
 platform: ruby
 authors:
 - Ivan Nečas
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2021-07-13 00:00:00.000000000 Z
+date: 2021-07-19 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: clamp
@@ -251,6 +251,7 @@ files:
 - definitions/procedures/iptables/remove_maintenance_mode_chain.rb
 - definitions/procedures/knowledge_base_article.rb
 - definitions/procedures/maintenance_mode/is_enabled.rb
+- definitions/procedures/packages/check_update.rb
 - definitions/procedures/packages/enable_version_locking.rb
 - definitions/procedures/packages/install.rb
 - definitions/procedures/packages/installer_confirmation.rb
@@ -262,6 +263,7 @@ files:
 - definitions/procedures/passenger_recycler.rb
 - definitions/procedures/prep_6_10_upgrade.rb
 - definitions/procedures/pulp/migrate.rb
+- definitions/procedures/pulp/print_remove_instructions.rb
 - definitions/procedures/pulp/remove.rb
 - definitions/procedures/pulpcore/migrate.rb
 - definitions/procedures/puppet/delete_empty_ca_cert_request_files.rb