foreman_maintain 1.6.10 → 1.6.11

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 6d9b63f8c0c837772d8b3970d21f05e1b1a10a8b4a85784c4aca8cf337668dd1
-  data.tar.gz: 97034a6b9d3afef56fe2e996d7704e46c4eed61d9f86fc5cf9e9b62ddc425b96
+  metadata.gz: 251038c33fba4faa2abf9c839937e229a664703c9b3003376b4d88aa7eca7d02
+  data.tar.gz: 72f4bb7fe9e7a9862df58accbfa190019a3356e99917d884242ad90259743291
 SHA512:
-  metadata.gz: cf9b2cf09d804f042cabb04f2215b088776ceee4987fb1aef6be1e09e19207e949b8fc028792729eef29445c8946c3103999bc4f43b07d4509106a1079f49cb0
-  data.tar.gz: f50fc364c0d8d1bfd1dc14764381cabdcde43483e302571a96cc171b4a9c607fad71251424211ed771ebd17cce80559a396ed0345d2a998d26d3239877988d21
+  metadata.gz: 140782d6ee833f07a64b2310fd94901f42991dc9babb2368cdc48c904fe78122c6e8ae6584bdb7c2818883e6c425035288d9f2859b7983d5957a5366c7c1a13a
+  data.tar.gz: 127c879d335e5dc46151d31e02d9fb72c4f45bcaff5ffcd83dee2ae1552877952a2b7128b28e45c69cab779df7055025e9bfdfa014bc484ae17ef2ffdd595ad3

data/definitions/features/capsule.rb

@@ -18,4 +18,8 @@ class Features::Capsule < ForemanMaintain::Feature
   def package_name
     'satellite-capsule'
   end
+
+  def module_name
+    'satellite-capsule'
+  end
 end

data/definitions/features/satellite.rb

@@ -22,6 +22,10 @@ class Features::Satellite < ForemanMaintain::Feature
     'satellite'
   end
 
+  def module_name
+    'satellite'
+  end
+
   private
 
   def version_from_source

data/definitions/procedures/backup/prepare_directory.rb

@@ -6,18 +6,29 @@ module Procedures::Backup
       param :backup_dir, 'Directory where to backup to', :required => true
       param :preserve_dir, 'Directory where to backup to', :flag => true
       param :incremental_dir, 'Changes since specified backup only'
+      param :online_backup, 'Select for online backup', :flag => true, :default => false
     end
 
+    # rubocop:disable Metrics/MethodLength
     def run
-      puts "Creating backup folder #{@backup_dir}"
-
       unless @preserve_dir
+        puts "Creating backup folder #{@backup_dir}"
+
         FileUtils.mkdir_p @backup_dir
         FileUtils.chmod_R 0o770, @backup_dir
-      end
 
-      if feature(:instance).postgresql_local? && !@preserve_dir
-        FileUtils.chown_R(nil, 'postgres', @backup_dir)
+        if feature(:instance).postgresql_local? && @online_backup
+          begin
+            FileUtils.chown_R(nil, 'postgres', @backup_dir)
+          rescue Errno::EPERM
+            warn_msg = <<~MSG
+              #{@backup_dir} could not be made readable by the 'postgres' user.
+              This won't affect the backup procedure, but you have to ensure that
+              the 'postgres' user can read the data during restore.
+            MSG
+            set_status(:warning, warn_msg)
+          end
+        end
       end
 
       FileUtils.rm(Dir.glob(File.join(@backup_dir, '.*.snar'))) if @preserve_dir
@@ -30,5 +41,6 @@ module Procedures::Backup
         end
       end
     end
+    # rubocop:enable Metrics/MethodLength
   end
 end

data/definitions/scenarios/backup.rb

@@ -20,7 +20,8 @@ module ForemanMaintain::Scenarios
       check_valid_strategy
       safety_confirmation
       add_step_with_context(Procedures::Backup::AccessibilityConfirmation) if strategy == :offline
-      add_step_with_context(Procedures::Backup::PrepareDirectory)
+      add_step_with_context(Procedures::Backup::PrepareDirectory,
+        :online_backup => strategy == :online)
       add_step_with_context(Procedures::Backup::Metadata, :online_backup => strategy == :online)
 
       case strategy
@@ -136,7 +137,6 @@ module ForemanMaintain::Scenarios
     def compose
       if strategy == :offline
         add_step_with_context(Procedures::Service::Start)
-        add_steps_with_context(find_procedures(:maintenance_mode_off))
       end
       add_step_with_context(Procedures::Backup::Clean)
     end

data/definitions/scenarios/satellite_upgrade.rb

@@ -4,7 +4,7 @@ module Scenarios::Satellite
       metadata do
         tags :upgrade_scenario
         confine do
-          (feature(:instance).downstream.current_minor_version == '6.15' || \
+          (feature(:instance).downstream&.current_minor_version == '6.15' || \
             ForemanMaintain.upgrade_in_progress == '6.16')
         end
         instance_eval(&block)
@@ -60,7 +60,7 @@ module Scenarios::Satellite
       if el8?
         modules_to_switch = ['postgresql:13']
         add_step(Procedures::Packages::SwitchModules.new(:module_names => modules_to_switch))
-        modules_to_enable = ["satellite:#{el_short_name}"]
+        modules_to_enable = ["#{feature(:instance).downstream.module_name}:#{el_short_name}"]
         add_step(Procedures::Packages::EnableModules.new(:module_names => modules_to_enable))
       end
       add_step(Procedures::Packages::Update.new(

data/lib/foreman_maintain/version.rb

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

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: foreman_maintain
 version: !ruby/object:Gem::Version
-  version: 1.6.10
+  version: 1.6.11
 platform: ruby
 authors:
 - Ivan Nečas
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2024-06-17 00:00:00.000000000 Z
+date: 2024-06-26 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: clamp
@@ -293,7 +293,6 @@ files:
 - definitions/procedures/restore/extract_files.rb
 - definitions/procedures/restore/foreman_dump.rb
 - definitions/procedures/restore/installer_reset.rb
-- definitions/procedures/restore/postgres_owner.rb
 - definitions/procedures/restore/pulpcore_dump.rb
 - definitions/procedures/restore/reindex_databases.rb
 - definitions/procedures/restore/required_packages.rb

data/definitions/procedures/restore/postgres_owner.rb

@@ -1,18 +0,0 @@
-module Procedures::Restore
-  class PostgresOwner < ForemanMaintain::Procedure
-    include ForemanMaintain::Concerns::SystemHelpers
-    metadata do
-      description 'Make postgres owner of backup directory'
-
-      param :backup_dir,
-        'Path to backup directory',
-        :required => true
-    end
-
-    def run
-      if feature(:instance).foreman_proxy_with_content?
-        FileUtils.chown(nil, 'postgres', @backup_dir)
-      end
-    end
-  end
-end