foreman_maintain 1.6.9 → 1.6.10

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: cdd4ef357f342501b15fbaf461be19952c2d09fde6fb7c1f3523711201ef3faa
-  data.tar.gz: cc9b2d323a171c5676276767f11c4a83adc5123fab01f58114d88a80a3ddba13
+  metadata.gz: 6d9b63f8c0c837772d8b3970d21f05e1b1a10a8b4a85784c4aca8cf337668dd1
+  data.tar.gz: 97034a6b9d3afef56fe2e996d7704e46c4eed61d9f86fc5cf9e9b62ddc425b96
 SHA512:
-  metadata.gz: fffefa90d5f28514280c732cb232003acb543420a9ca9fd5a9cf77749beecb1533a05d71bb6b7c5db1e3e06dcb5909a5fa3e8f85ef3a98ae369f090cef84c052
-  data.tar.gz: cb4997dcbb7eba53f9e4d82445ad327316e3a1ace686e62ffd0b3f4a63ecd418542d73c42d7fe10692fb48054dc902b42faaff2772c744e91c421160210fec13
+  metadata.gz: cf9b2cf09d804f042cabb04f2215b088776ceee4987fb1aef6be1e09e19207e949b8fc028792729eef29445c8946c3103999bc4f43b07d4509106a1079f49cb0
+  data.tar.gz: f50fc364c0d8d1bfd1dc14764381cabdcde43483e302571a96cc171b4a9c607fad71251424211ed771ebd17cce80559a396ed0345d2a998d26d3239877988d21

data/definitions/checks/foreman/validate_external_db_version.rb

@@ -12,15 +12,15 @@ module Checks
 
       def run
         current_db_version = feature(:foreman_database).db_version
-        fail!(db_upgrade_message(current_db_version)) if current_db_version.major < 12
+        fail!(db_upgrade_message(current_db_version)) if current_db_version.major < 13
       end
 
       def db_upgrade_message(db_version)
         product_name = feature(:instance).product_name
 
         "\n\n*** ERROR: Server is running on PostgreSQL #{db_version} database.\n"\
-        "*** Newer version of #{product_name} supports only PostgreSQL version 12.\n"\
-        "*** Before proceeding further, you must upgrade database to PostgreSQL 12.\n"
+        "*** Newer version of #{product_name} supports only PostgreSQL version 13.\n"\
+        "*** Before proceeding further, you must upgrade database to PostgreSQL 13.\n"
       end
     end
   end

data/definitions/features/katello.rb

@@ -9,10 +9,6 @@ class Features::Katello < ForemanMaintain::Feature
     end
   end
 
-  def data_dirs
-    @dirs ||= ['/var/lib/pulp', '/var/lib/pgsql']
-  end
-
   def current_version
     @current_version ||= package_version('katello')
   end

data/definitions/procedures/hammer_setup.rb

@@ -18,6 +18,10 @@ class Procedures::HammerSetup < ForemanMaintain::Procedure
   end
 
   def necessary?
-    !feature(:hammer).check_connection
+    if feature(:hammer)
+      !feature(:hammer).check_connection
+    else
+      false
+    end
   end
 end

data/definitions/procedures/packages/update_all_confirmation.rb

@@ -8,11 +8,18 @@ module Procedures::Packages
 
     def run
       if @packages.nil? || @packages.empty?
-        question = "\nWARNING: No specific packages to update were provided\n" \
-          "so we are going to update all available packages.\n" \
-          "To Upgrade to next version use 'foreman-maintain upgrade'.\n\n" \
-          "Do you want to proceed with update of everything regardless\n" \
-          'of the recommendations?'
+        command = ForemanMaintain.command_name
+
+        question = <<~MSG
+          WARNING: No specific packages to update were provided
+          so we are going to update all available packages. We
+          recommend using the update command to update to a minor
+          version and/or operating system using '#{command} update'.
+          To upgrade to the next #{feature(:instance).product_name} version use '#{command} upgrade'.
+          Do you want to proceed with update of everything regardless of
+          the recommendations?
+        MSG
+
         answer = ask_decision(question, actions_msg: 'y(yes), q(quit)')
         abort! unless answer == :yes
       end

data/definitions/procedures/pulpcore/container_handle_image_metadata.rb

@@ -17,9 +17,6 @@ module Procedures::Pulpcore
         spinner.update('Adding image metadata to pulp. You can continue using the ' \
                'system normally while the task runs in the background.')
         execute!(pulpcore_manager('container-handle-image-data'))
-        spinner.update('Adding image metadata to katello. You can continue using the ' \
-               'system normally while the task runs in the background.')
-        execute!('foreman-rake katello:import_container_manifest_labels')
       end
     end
   end

data/definitions/procedures/repositories/index_katello_repositories_container_metadata.rb

@@ -0,0 +1,17 @@
+module Procedures::Repositories
+  class IndexKatelloRepositoriesContainerMetatdata < ForemanMaintain::Procedure
+    metadata do
+      description 'Import container manifest metadata'
+      confine do
+        feature(:katello)
+      end
+    end
+
+    def run
+      with_spinner(('Adding image metadata. You can continue using the ' \
+                    'system normally while the task runs in the background.')) do
+        execute!('foreman-rake katello:import_container_manifest_labels')
+      end
+    end
+  end
+end

data/definitions/scenarios/backup.rb

@@ -81,15 +81,13 @@ module ForemanMaintain::Scenarios
       include_dumps if include_db_dumps?
       add_step_with_context(Procedures::ForemanProxy::Features, :load_only => true)
       add_steps_with_context(
-        find_procedures(:maintenance_mode_on),
         Procedures::Service::Stop,
         Procedures::Backup::ConfigFiles,
         Procedures::Backup::Pulp,
         Procedures::Backup::Offline::CandlepinDB,
         Procedures::Backup::Offline::ForemanDB,
         Procedures::Backup::Offline::PulpcoreDB,
-        Procedures::Service::Start,
-        find_procedures(:maintenance_mode_off)
+        Procedures::Service::Start
       )
     end
 

data/definitions/scenarios/foreman_upgrade.rb

@@ -135,7 +135,8 @@ module Scenarios::ForemanUpgrade
         Checks::ServicesUp,
         Checks::SystemRegistration,
         Procedures::Packages::CheckForReboot,
-        Procedures::Pulpcore::ContainerHandleImageMetadata
+        Procedures::Pulpcore::ContainerHandleImageMetadata,
+        Procedures::Repositories::IndexKatelloRepositoriesContainerMetatdata
       )
     end
   end

data/definitions/scenarios/satellite_upgrade.rb

@@ -4,7 +4,7 @@ module Scenarios::Satellite
       metadata do
         tags :upgrade_scenario
         confine do
-          (feature(:downstream).current_minor_version == '6.15' || \
+          (feature(:instance).downstream.current_minor_version == '6.15' || \
             ForemanMaintain.upgrade_in_progress == '6.16')
         end
         instance_eval(&block)
@@ -99,6 +99,7 @@ module Scenarios::Satellite
       add_steps(find_checks(:post_upgrade))
       add_step(Procedures::Packages::CheckForReboot)
       add_step(Procedures::Pulpcore::ContainerHandleImageMetadata)
+      add_step(Procedures::Repositories::IndexKatelloRepositoriesContainerMetatdata)
     end
   end
 end

data/lib/foreman_maintain/update_runner.rb

@@ -46,7 +46,7 @@ module ForemanMaintain
     def finish_update
       @finished = true
       @reporter.hline
-      @reporter.puts("Update finished.")
+      @reporter.puts("Update finished.\n")
     end
 
     def storage

data/lib/foreman_maintain/version.rb

@@ -1,3 +1,3 @@
 module ForemanMaintain
-  VERSION = '1.6.9'.freeze
+  VERSION = '1.6.10'.freeze
 end

data/lib/foreman_maintain.rb

@@ -174,6 +174,10 @@ module ForemanMaintain
       [main_package_name, 'foreman-maintain']
     end
 
+    def command_name
+      pkg_and_cmd_name[1]
+    end
+
     def perform_self_upgrade
       package_name, command = pkg_and_cmd_name
 

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: foreman_maintain
 version: !ruby/object:Gem::Version
-  version: 1.6.9
+  version: 1.6.10
 platform: ruby
 authors:
 - Ivan Nečas
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2024-06-11 00:00:00.000000000 Z
+date: 2024-06-17 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: clamp
@@ -284,6 +284,7 @@ files:
 - definitions/procedures/repositories/backup_enabled_repos.rb
 - definitions/procedures/repositories/disable.rb
 - definitions/procedures/repositories/enable.rb
+- definitions/procedures/repositories/index_katello_repositories_container_metadata.rb
 - definitions/procedures/repositories/setup.rb
 - definitions/procedures/restore/candlepin_dump.rb
 - definitions/procedures/restore/configs.rb