foreman_maintain 0.8.16 → 0.8.17

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 330f6d0f73f84f10df176acb7a958f0f1658243640d9c524e3b42886764ff8b3
-  data.tar.gz: eb68bd5cf88dc5e5bdb2bb4de29313481f4f91afdeae38c8d0c7c157e06f9665
+  metadata.gz: f613ab2a7afc435fa01364dac9c15825723b336336676056d7f796b57a21e841
+  data.tar.gz: fd709a9384cb55f2ccf9a9a7e3be34bf239b24748f8fff49fd2921c08df4c228
 SHA512:
-  metadata.gz: dd143d3b505a240f153eafa2a12a034819305a734d34d2dbd4a67c54c0623b32810d826d5727ffb7df31bd001adb07e6c52c50c0e4d85f35cdfdaa62456b8234
-  data.tar.gz: 2107652e378bb31ce8b06cd3a0f7b2ece365574110770c8d626e03c660ffef902db12eaaee6d19eb1741c6447565a02b8eef666b9e9f024468096cafe52e43d8
+  metadata.gz: 55958174a3e670b8ccfefeb09695a8fc84a323901c490f2dc0df88669c2f4d7e870f48a3d5c45f42f668f26fec8fe74d6478b29fcdb2a31f4bbd6b85137f8a41
+  data.tar.gz: 167635eec986782698efdaff762167d18e5a5f63d5f371ebe9600457ced03a6db849465d36c1c9e4fea377dcb47adfec1989e2ed67aaf71dba01d4dcce3a72b3

data/definitions/checks/check_for_newer_packages.rb

@@ -0,0 +1,26 @@
+class Checks::CheckForNewerPackages < ForemanMaintain::Check
+  metadata do
+    label :check_for_newer_packages
+    description 'Check for newer packages and optionally ask for confirmation if not found.'
+
+    param :packages,
+          'package names to validate',
+          :required => true
+    param :manual_confirmation_version,
+          'Version of satellite (6.9) to ask the user if they are on the latest minor release of.',
+          :required => false
+  end
+
+  def run
+    exit_status, = ForemanMaintain.package_manager.check_update(packages: @packages,
+                                                                with_status: true)
+    assert(exit_status == 0, 'An update is available for one of these packages: '\
+                "#{@packages.join(',')}. Please update before proceeding.")
+    if @manual_confirmation_version
+      question = 'Confirm that you are running the latest minor release of Satellite '\
+                "#{@manual_confirmation_version}"
+      answer = ask_decision(question, actions_msg: 'y(yes), q(quit)')
+      abort! if answer != :yes
+    end
+  end
+end

data/definitions/procedures/backup/snapshot/logical_volume_confirmation.rb

@@ -10,22 +10,31 @@ module Procedures::Backup
 
       def run
         backup_lv = get_lv_info(@backup_dir)
-
-        dbs = {}
-        dbs[:pulp2] = 'Pulp' if feature(:pulp2) && !@skip_pulp
-        dbs[:mongo] = 'Mongo' if db_local?(:mongo)
-        dbs[:candlepin_database] = 'Candlepin' if db_local?(:candlepin_database)
-        dbs[:foreman_database] = 'Foreman' if db_local?(:foreman_database)
-        dbs[:pulpcore_database] = 'Pulpcore' if db_local?(:pulpcore_database)
-
         shared_lv = dbs.inject([]) do |list, (db_label, db_name)|
           db_lv = get_lv_info(feature(db_label).data_dir)
           list << db_name if db_lv == backup_lv
           list
         end
+
+        pulp_data_lv = get_lv_info(current_pulp_feature.pulp_data_dir)
+        shared_lv << 'Pulp' if pulp_data_lv == backup_lv && !@skip_pulp
+
         confirm(shared_lv) if shared_lv.any?
       end
 
+      def current_pulp_feature
+        feature(:pulp2) || feature(:pulpcore_database)
+      end
+
+      def dbs
+        dbs = {}
+        dbs[:mongo] = 'Mongo' if db_local?(:mongo)
+        dbs[:candlepin_database] = 'Candlepin' if db_local?(:candlepin_database)
+        dbs[:foreman_database] = 'Foreman' if db_local?(:foreman_database)
+        dbs[:pulpcore_database] = 'Pulpcore' if db_local?(:pulpcore_database)
+        dbs
+      end
+
       private
 
       def db_local?(db)

data/definitions/procedures/backup/snapshot/mount_pulp.rb

@@ -15,8 +15,8 @@ module Procedures::Backup
       def run
         skip if @skip
         with_spinner('Creating snapshot of Pulp') do |spinner|
-          current_pulp_feature.with_marked_directory(current_pulp_feature.data_dir) do
-            lv_info = get_lv_info(current_pulp_feature.data_dir)
+          current_pulp_feature.with_marked_directory(current_pulp_feature.pulp_data_dir) do
+            lv_info = get_lv_info(current_pulp_feature.pulp_data_dir)
             create_lv_snapshot('pulp-snap', @block_size, lv_info[0])
             spinner.update("Mounting snapshot of Pulp on #{mount_location('pulp')}")
             mount_snapshot('pulp', lv_info[1])

data/definitions/procedures/content/prepare.rb

@@ -3,12 +3,14 @@ module Procedures::Content
     metadata do
       description 'Prepare content for Pulp 3'
       for_feature :pulpcore
+      param :quiet, 'Keep the output on a single line', :flag => true, :default => false
     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)
+      env_vars = @quiet ? '' : 'preserve_output=true '
+      puts execute!("#{env_vars}foreman-rake katello:pulp3_migration", :interactive => true)
     end
   end
 end

data/definitions/scenarios/content.rb

@@ -2,11 +2,10 @@ module ForemanMaintain::Scenarios
   module Content
     class ContentBase < ForemanMaintain::Scenario
       def enable_and_start_services
-        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))
+                 new(:include => Features::Pulpcore.pulpcore_migration_services))
       end
 
       def disable_and_stop_services
@@ -27,12 +26,18 @@ module ForemanMaintain::Scenarios
       def compose
         if feature(:satellite) && feature(:satellite).at_least_version?('6.9')
           enable_and_start_services
-          add_step(Procedures::Content::Prepare)
+          add_step(Procedures::Content::Prepare.new(quiet: quiet?))
           disable_and_stop_services
         elsif !feature(:satellite)
-          add_step(Procedures::Content::Prepare)
+          add_step(Procedures::Content::Prepare.new(quiet: quiet?))
         end
       end
+
+      private
+
+      def quiet?
+        !!context.get(:quiet)
+      end
     end
 
     class Switchover < ContentBase
@@ -57,6 +62,7 @@ module ForemanMaintain::Scenarios
 
       def compose
         if !feature(:satellite) || feature(:satellite).at_least_version?('6.9')
+          enable_and_start_services if feature(:satellite)
           add_step(Procedures::Content::PrepareAbort)
           disable_and_stop_services if feature(:satellite)
         end

data/definitions/scenarios/upgrade_to_satellite_6_10.rb

@@ -26,8 +26,12 @@ module Scenarios::Satellite_6_10
 
     def compose
       add_step(Checks::Puppet::WarnAboutPuppetRemoval)
+      add_step(Checks::CheckForNewerPackages.new(:packages => [foreman_plugin_name('katello'),
+                                                               'python3-pulp-2to3-migration'],
+                                                 :manual_confirmation_version => '6.9'))
       add_steps(find_checks(:default))
       add_steps(find_checks(:pre_upgrade))
+
       add_step(Checks::Foreman::CheckpointSegments)
       add_step(Checks::Repositories::Validate.new(:version => '6.10'))
     end

data/lib/foreman_maintain/cli/content_command.rb

@@ -2,8 +2,9 @@ module ForemanMaintain
   module Cli
     class ContentCommand < Base
       subcommand 'prepare', 'Prepare content for Pulp 3' do
+        option ['-q', '--quiet'], :flag, 'Keep the output on a single line'
         def execute
-          run_scenarios_and_exit(Scenarios::Content::Prepare.new)
+          run_scenarios_and_exit(Scenarios::Content::Prepare.new(:quiet => quiet?))
         end
       end
 

data/lib/foreman_maintain/package_manager/yum.rb

@@ -61,8 +61,9 @@ module ForemanMaintain::PackageManager
       yum_action('clean', 'all', :assumeyes => assumeyes)
     end
 
-    def check_update
-      yum_action('check-update', nil, :assumeyes => true, :valid_exit_statuses => [100])
+    def check_update(packages: nil, with_status: false)
+      yum_action('check-update', packages, :assumeyes => true, :valid_exit_statuses => [100],
+                                           :with_status => with_status)
     end
 
     def update_available?(package)

data/lib/foreman_maintain/utils/command_runner.rb

@@ -59,12 +59,15 @@ module ForemanMaintain
 
       private
 
+      # rubocop:disable Metrics/MethodLength
       def run_interactively
         # use tmp files to capture output and exit status of the command when
         # running interactively
         log_file = Tempfile.open('captured-output')
         exit_file = Tempfile.open('captured-exit-code')
-        Kernel.system("script -qc '#{full_command}; echo $? > #{exit_file.path}' #{log_file.path}")
+        Kernel.system(
+          "bash -c '#{full_command}; echo $? > #{exit_file.path}' | tee -i #{log_file.path}"
+        )
         File.open(log_file.path) { |f| @output = f.read }
         File.open(exit_file.path) do |f|
           exit_status = f.read.strip
@@ -78,6 +81,7 @@ module ForemanMaintain
         log_file.close
         exit_file.close
       end
+      # rubocop:enable Metrics/MethodLength
 
       def run_non_interactively
         IO.popen(full_command, 'r+') do |f|

data/lib/foreman_maintain/version.rb

@@ -1,3 +1,3 @@
 module ForemanMaintain
-  VERSION = '0.8.16'.freeze
+  VERSION = '0.8.17'.freeze
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: foreman_maintain
 version: !ruby/object:Gem::Version
-  version: 0.8.16
+  version: 0.8.17
 platform: ruby
 authors:
 - Ivan Nečas
-autorequire:
+autorequire: 
 bindir: bin
 cert_chain: []
-date: 2021-09-10 00:00:00.000000000 Z
+date: 2021-09-22 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: clamp
@@ -122,6 +122,7 @@ files:
 - definitions/checks/backup/directory_ready.rb
 - definitions/checks/candlepin/db_up.rb
 - definitions/checks/candlepin/validate_db.rb
+- definitions/checks/check_for_newer_packages.rb
 - definitions/checks/check_hotfix_installed.rb
 - definitions/checks/check_tmout.rb
 - definitions/checks/disk/available_space.rb
@@ -415,7 +416,7 @@ homepage: https://github.com/theforeman/foreman_maintain
 licenses:
 - GPL-3.0
 metadata: {}
-post_install_message:
+post_install_message: 
 rdoc_options: []
 require_paths:
 - lib
@@ -430,8 +431,8 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.1.6
-signing_key:
+rubygems_version: 3.0.9
+signing_key: 
 specification_version: 4
 summary: Foreman maintenance tool belt
 test_files: []