foreman_maintain 1.8.1 → 1.8.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 076bba551da26888de415a1f67a2b1950493db5cbcc8ace83b3efd0498ffa96d
-  data.tar.gz: b39e663f0109565f11303ce1cd02740e8b937dbd554ff3d8123446b63d09e073
+  metadata.gz: a042b3f0cd480eab2e674abcbd5aecb247943b481bad114e31376610a3b785d0
+  data.tar.gz: 16e74a0e82caffb11d5d0363046bfa5120afab203ce1d88ad88a4311f664e1f4
 SHA512:
-  metadata.gz: 636a6a7fde3ba794afd5080133c38ec4f77533190659b901fc796daa6c0130f7b213c2e9572b1c149e6a6a55911423c5431606b7e119cbe5613b7f91543bface
-  data.tar.gz: c7361d2bc970e0d58b6e4a2f4fb32550720ceb3565759447305c36339015ad96cc19722e53f9a21130834f3a582b29614de5848d04c7ea1a950b83ed5b2693f8
+  metadata.gz: 7bcc01a88e2f8bebb549a83af6d0b1f33a714a76925dc51ee48a2a979611e7d8fc47ed91b162ce97bd004360f9bb8cef7499c34160283e539e63e8b7f4b8315f
+  data.tar.gz: 4e056e25de905cb6bb98da55c10dc1c1a57b99de6ed39b13241c4d09d7e2ca8cbaacaf6a44153ccd0f9675f432cda32ed9cb617399c3258940b0569898b12448

data/definitions/checks/restore/validate_backup.rb

@@ -42,35 +42,30 @@ module Checks::Restore
     def required_katello_files(backup)
       backup_files_message(
         backup.katello_online_files.join(', '),
-        backup.katello_offline_files.join(', '),
-        [backup.katello_online_files + backup.katello_offline_files].join(', ')
+        backup.katello_offline_files.join(', ')
       )
     end
 
     def required_fpc_files(backup)
       backup_files_message(
         backup.fpc_online_files.join(', '),
-        backup.fpc_offline_files.join(', '),
-        [backup.fpc_online_files + backup.fpc_offline_files].join(', ')
+        backup.fpc_offline_files.join(', ')
       )
     end
 
     def required_foreman_files(backup)
       backup_files_message(
         backup.foreman_online_files.join(', '),
-        backup.foreman_offline_files.join(', '),
-        [backup.foreman_online_files + backup.foreman_offline_files].join(', ')
+        backup.foreman_offline_files.join(', ')
       )
     end
 
-    def backup_files_message(online_files, offline_files, logical_files)
+    def backup_files_message(online_files, offline_files)
       message = ''
       message += 'An online or remote database backup directory contains: '
       message += "#{online_files}\n"
       message += 'An offline backup directory contains: '
       message += "#{offline_files}\n"
-      message += 'A logical backup directory contains: '
-      message += "#{logical_files}\n"
       message
     end
   end

data/definitions/features/foreman_proxy.rb

@@ -70,6 +70,7 @@ class Features::ForemanProxy < ForemanMaintain::Feature
       configs += ['/var/lib/dhcpd', File.dirname(dhcpd_config_file)]
     end
     configs.push('/usr/share/xml/scap') if backup_features.include?('openscap')
+    configs.push('/etc/ansible') if backup_features.include?('ansible')
     configs
   end
 

data/definitions/features/puppet_server.rb

@@ -26,10 +26,6 @@ class Features::PuppetServer < ForemanMaintain::Feature
     find_package('puppetserver') ? [system_service('puppetserver', 30)] : []
   end
 
-  def puppet_version
-    version(execute!("#{puppet_path} --version"))
-  end
-
   def find_empty_cacert_request_files
     cmd_output = execute!("find #{cacert_requests_directory} -type f -size 0 | paste -d, -s")
     cmd_output.split(',')

data/definitions/procedures/pulpcore/container_handle_image_metadata.rb

@@ -14,8 +14,7 @@ module Procedures::Pulpcore
 
         feature(:service).handle_services(spinner, 'start', :only => necessary_services)
 
-        spinner.update('Adding image metadata to pulp. You can continue using the ' \
-               'system normally while the task runs in the background.')
+        spinner.update('Adding image metadata to pulp.')
         execute!(pulpcore_manager('container-handle-image-data'))
       end
     end

data/definitions/procedures/repositories/index_katello_repositories_container_metadata.rb

@@ -8,8 +8,7 @@ module Procedures::Repositories
     end
 
     def run
-      with_spinner(('Adding image metadata. You can continue using the ' \
-                    'system normally while the task runs in the background.')) do
+      with_spinner('Adding image metadata to Katello.') do
         execute!('foreman-rake katello:import_container_manifest_labels')
       end
     end

data/lib/foreman_maintain/utils/backup.rb

@@ -67,18 +67,15 @@ module ForemanMaintain
       end
 
       def valid_fpc_backup?
-        fpc_online_backup? || fpc_standard_backup? || fpc_logical_backup? || \
-          fpc_hybrid_db_backup?
+        fpc_online_backup? || fpc_standard_backup?
       end
 
       def valid_katello_backup?
-        katello_online_backup? || katello_standard_backup? || katello_logical_backup? || \
-          # Katello can have setup where some of dbs are external but not all
-          katello_hybrid_db_backup?
+        katello_online_backup? || katello_standard_backup?
       end
 
       def valid_foreman_backup?
-        foreman_standard_backup? || foreman_online_backup? || foreman_logical_backup?
+        foreman_standard_backup? || foreman_online_backup?
       end
 
       def check_file_existence(existence_map)
@@ -111,19 +108,6 @@ module ForemanMaintain
           :absent => absent)
       end
 
-      def katello_logical_backup?
-        present = [:pgsql_data, :candlepin_dump, :foreman_dump, :pulpcore_dump]
-        absent = []
-        check_file_existence(:present => present,
-          :absent => absent)
-      end
-
-      def katello_hybrid_db_backup?
-        all_dbs = { :pgsql_data => %w[candlepin foreman pulpcore] }
-        present, absent = dumps_for_hybrid_db_setup(all_dbs)
-        check_file_existence(:present => present, :absent => absent)
-      end
-
       def fpc_standard_backup?
         present = [:pgsql_data]
         absent = [:candlepin_dump, :foreman_dump, :pulpcore_dump]
@@ -137,19 +121,6 @@ module ForemanMaintain
         check_file_existence(:present => present, :absent => absent)
       end
 
-      def fpc_logical_backup?
-        present = [:pulpcore_dump, :pgsql_data]
-        absent = [:candlepin_dump, :foreman_dump]
-        check_file_existence(:present => present, :absent => absent)
-      end
-
-      def fpc_hybrid_db_backup?
-        all_dbs = { :pgsql_data => ['pulpcore'] }
-        present, absent = dumps_for_hybrid_db_setup(all_dbs)
-        absent.concat [:candlepin_dump, :foreman_dump]
-        check_file_existence(:present => present, :absent => absent)
-      end
-
       def foreman_standard_backup?
         check_file_existence(:present => [:pgsql_data],
           :absent => [:candlepin_dump, :foreman_dump, :pulpcore_dump])
@@ -160,30 +131,6 @@ module ForemanMaintain
           :absent => [:candlepin_dump, :pgsql_data, :pulpcore_dump])
       end
 
-      def foreman_logical_backup?
-        check_file_existence(:present => [:pgsql_data, :foreman_dump],
-          :absent => [:candlepin_dump, :pulpcore_dump])
-      end
-
-      def dumps_for_hybrid_db_setup(dbs_hash)
-        present = []
-        absent = []
-        dbs_hash.each do |data_file, dbs|
-          dbs.each do |db|
-            feature_label = "#{db}_database"
-            dump_file = "#{db}_dump"
-            if feature(feature_label.to_sym).local?
-              present |= [data_file]
-              absent << dump_file.to_sym
-            else
-              present << dump_file.to_sym
-            end
-          end
-          absent |= [data_file] unless present.include?(data_file)
-        end
-        [present, absent]
-      end
-
       def validate_hostname?
         # make sure that the system hostname is the same as the backup
         metadata.fetch('hostname', nil) == hostname

data/lib/foreman_maintain/version.rb

@@ -1,3 +1,3 @@
 module ForemanMaintain
-  VERSION = '1.8.1'.freeze
+  VERSION = '1.8.2'.freeze
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: foreman_maintain
 version: !ruby/object:Gem::Version
-  version: 1.8.1
+  version: 1.8.2
 platform: ruby
 authors:
 - Ivan Nečas
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2024-10-21 00:00:00.000000000 Z
+date: 2024-11-13 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: clamp
@@ -142,7 +142,6 @@ email: inecas@redhat.com
 executables:
 - foreman-maintain
 - foreman-maintain-complete
-- foreman-maintain-rotate-tar
 extensions: []
 extra_rdoc_files:
 - LICENSE