foreman_maintain 0.5.4 → 0.6.4

data/lib/foreman_maintain/utils/backup.rb

@@ -16,6 +16,9 @@ module ForemanMaintain
         @backup_dir = backup_dir
         @standard_files = ['config_files.tar.gz']
         @katello_online_files = ['mongo_dump', 'candlepin.dump', 'foreman.dump']
+        if feature(:pulpcore)
+          @katello_online_files << 'pulpcore.dump'
+        end
         @katello_offline_files = ['mongo_data.tar.gz', 'pgsql_data.tar.gz']
         @foreman_online_files = ['foreman.dump']
         @foreman_offline_files = ['pgsql_data.tar.gz']
@@ -35,6 +38,10 @@ module ForemanMaintain
           :pg_globals => map_file(@backup_dir, 'pg_globals.dump'),
           :metadata => map_file(@backup_dir, 'metadata.yml')
         }
+        if feature(:pulpcore)
+          @file_map[:pulpcore_dump] = map_file(@backup_dir, 'pulpcore.dump')
+        end
+        @file_map
       end
 
       def map_file(backup_dir, filename)
@@ -77,92 +84,80 @@ module ForemanMaintain
         foreman_standard_backup? || foreman_online_backup? || foreman_logical_backup?
       end
 
+      def check_file_existence(existence_map)
+        unless feature(:pulpcore)
+          existence_map[:present].delete(:pulpcore_dump)
+          existence_map[:absent].delete(:pulpcore_dump)
+        end
+
+        existence_map[:present].each do |file|
+          unless file_map[file][:present]
+            return false
+          end
+        end
+
+        existence_map[:absent].each do |file|
+          if file_map[file][:present]
+            return false
+          end
+        end
+
+        true
+      end
+
+      # TODO: Need to check for pulpcore feature?
       def katello_standard_backup?
-        file_map[:mongo_data][:present] &&
-          file_map[:pgsql_data][:present] &&
-          !(
-            file_map[:candlepin_dump][:present] ||
-            file_map[:foreman_dump][:present] ||
-            file_map[:mongo_dump][:present]
-          )
+        check_file_existence(:present => [:mongo_data, :pgsql_data],
+                             :absent => [:candlepin_dump, :foreman_dump,
+                                         :pulpcore_dump, :mongo_dump])
       end
 
       def katello_online_backup?
-        file_map[:candlepin_dump][:present] &&
-          file_map[:foreman_dump][:present] &&
-          file_map[:mongo_dump][:present] &&
-          !(
-            file_map[:mongo_data][:present] ||
-            file_map[:pgsql_data][:present]
-          )
+        check_file_existence(:present => [:candlepin_dump, :foreman_dump,
+                                          :pulpcore_dump, :mongo_dump],
+                             :absent => [:mongo_data, :pgsql_data])
       end
 
       def katello_logical_backup?
-        file_map[:mongo_dump][:present] &&
-          file_map[:mongo_data][:present] &&
-          file_map[:pgsql_data][:present] &&
-          file_map[:candlepin_dump][:present] &&
-          file_map[:foreman_dump][:present]
+        check_file_existence(:present => [:mongo_dump, :mongo_data, :pgsql_data,
+                                          :candlepin_dump, :pulpcore_dump, :foreman_dump],
+                             :absent => [])
       end
 
       def fpc_standard_backup?
-        file_map[:mongo_data][:present] &&
-          !(
-            file_map[:pgsql_data][:present] ||
-            file_map[:candlepin_dump][:present] ||
-            file_map[:foreman_dump][:present] ||
-            file_map[:mongo_dump][:present]
-          )
+        check_file_existence(:present => [:mongo_data],
+                             :absent => [:pgsql_data, :candlepin_dump,
+                                         :foreman_dump, :mongo_dump, :pulpcore_dump])
       end
 
       def fpc_online_backup?
-        file_map[:mongo_dump][:present] &&
-          !(
-            file_map[:mongo_data][:present] ||
-            file_map[:pgsql_data][:present] ||
-            file_map[:candlepin_dump][:present] ||
-            file_map[:foreman_dump][:present]
-          )
+        absent = [:mongo_data, :pgsql_data, :candlepin_dump, :foreman_dump]
+
+        check_file_existence(:present => [:mongo_dump], :absent => absent) ||
+          check_file_existence(:present => [:pulpcore_dump], :absent => absent)
       end
 
       def fpc_logical_backup?
-        file_map[:mongo_dump][:present] &&
-          file_map[:mongo_data][:present] &&
-          !(
-            file_map[:pgsql_data][:present] ||
-            file_map[:candlepin_dump][:present] ||
-            file_map[:foreman_dump][:present]
-          )
+        absent = [:pgsql_data, :candlepin_dump, :foreman_dump]
+        check_file_existence(:present => [:mongo_dump, :mongo_data], :absent => absent) ||
+          check_file_existence(:present => [:pulpcore_dump], :absent => absent)
       end
 
       def foreman_standard_backup?
-        file_map[:pgsql_data][:present] &&
-          !(
-            file_map[:candlepin_dump][:present] ||
-            file_map[:foreman_dump][:present] ||
-            file_map[:mongo_data][:present] ||
-            file_map[:mongo_dump][:present]
-          )
+        check_file_existence(:present => [:pgsql_data],
+                             :absent => [:candlepin_dump, :foreman_dump, :pulpcore_dump,
+                                         :mongo_data, :mongo_dump])
       end
 
       def foreman_online_backup?
-        file_map[:foreman_dump][:present] &&
-          !(
-            file_map[:candlepin_dump][:present] ||
-            file_map[:pgsql_data][:present] ||
-            file_map[:mongo_data][:present] ||
-            file_map[:mongo_dump][:present]
-          )
+        check_file_existence(:present => [:foreman_dump],
+                             :absent => [:candlepin_dump, :pgsql_data,
+                                         :mongo_data, :mongo_dump])
       end
 
       def foreman_logical_backup?
-        file_map[:pgsql_data][:present] &&
-          file_map[:foreman_dump][:present] &&
-          !(
-            file_map[:candlepin_dump][:present] ||
-            file_map[:mongo_data][:present] ||
-            file_map[:mongo_dump][:present]
-          )
+        check_file_existence(:present => [:pgsql_data, :foreman_dump],
+                             :absent => [:candlepin_dump, :mongo_data, :mongo_dump])
       end
 
       def validate_hostname?
@@ -202,7 +197,8 @@ module ForemanMaintain
 
       def sql_dump_files_exist?
         file_map[:foreman_dump][:present] ||
-          file_map[:candlepin_dump][:present]
+          file_map[:candlepin_dump][:present] ||
+          (feature(:pulpcore) && file_map[:pulpcore_dump][:present])
       end
 
       def incremental?

data/lib/foreman_maintain/utils/service/abstract.rb

@@ -4,9 +4,16 @@ module ForemanMaintain::Utils
       include Comparable
       attr_reader :name, :priority
 
-      def initialize(name, priority, _options = {})
+      def initialize(name, priority, options = {})
         @name = name
         @priority = priority
+        @options = options
+      end
+
+      def socket
+        if @options[:socket]
+          self.class.new("#{@options[:socket]}.socket", priority)
+        end
       end
 
       def <=>(other)

data/lib/foreman_maintain/utils/service/systemd.rb

@@ -1,17 +1,26 @@
 module ForemanMaintain::Utils
   module Service
     class Systemd < Abstract
-      def initialize(name, priority, _options = {})
+      def initialize(name, priority, options = {})
         super
         @sys = SystemHelpers.new
       end
 
       def command(action, options = {})
         do_wait = options.fetch(:wait, true) # wait for service to start
+        all = @options.fetch(:all, false)
+        skip_enablement = @options.fetch(:skip_enablement, false)
+
+        if skip_enablement && %w[enable disable].include?(action)
+          return skip_enablement_message(action, @name)
+        end
+
         if do_wait && File.exist?('/usr/sbin/service-wait')
           "service-wait #{@name} #{action}"
         else
-          "systemctl #{action} #{@name}"
+          cmd = "systemctl #{action} #{@name}"
+          cmd += ' --all' if all
+          cmd
         end
       end
 
@@ -53,6 +62,21 @@ module ForemanMaintain::Utils
       def execute(action, options = {})
         @sys.execute_with_status(command(action, options))
       end
+
+      def skip_enablement_message(action, name)
+        # Enable and disable does not work well with globs since they treat them literally.
+        # We are skipping the pulpcore-workers@* for these actions until they are configured in
+        # a more managable way with systemd
+        # rubocop:disable Layout/IndentAssignment
+        msg =
+"
+\nWARNING: Skipping #{action} for #{name} as there are a variable amount of services to manage
+and this command will not respond to glob operators. These services have been configured by
+the installer and it is recommended to keep them enabled to prevent misconfiguration.\n
+"
+        # rubocop:enable Layout/IndentAssignment
+        puts msg
+      end
     end
   end
 end

data/lib/foreman_maintain/version.rb

@@ -1,3 +1,3 @@
 module ForemanMaintain
-  VERSION = '0.5.4'.freeze
+  VERSION = '0.6.4'.freeze
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: foreman_maintain
 version: !ruby/object:Gem::Version
-  version: 0.5.4
+  version: 0.6.4
 platform: ruby
 authors:
 - Ivan Nečas
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2020-05-14 00:00:00.000000000 Z
+date: 2020-05-27 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: clamp
@@ -122,7 +122,6 @@ files:
 - definitions/checks/backup/directory_ready.rb
 - definitions/checks/candlepin/db_up.rb
 - definitions/checks/candlepin/validate_db.rb
-- definitions/checks/check_epel_repository.rb
 - definitions/checks/check_hotfix_installed.rb
 - definitions/checks/check_tmout.rb
 - definitions/checks/disk/available_space.rb
@@ -132,6 +131,7 @@ files:
 - definitions/checks/foreman/db_up.rb
 - definitions/checks/foreman/facts_names.rb
 - definitions/checks/foreman/puppet_class_duplicates.rb
+- definitions/checks/foreman/validate_external_db_version.rb
 - definitions/checks/foreman_openscap/invalid_report_associations.rb
 - definitions/checks/foreman_proxy/verify_dhcp_config_syntax.rb
 - definitions/checks/foreman_tasks/invalid/check_old.rb
@@ -143,9 +143,11 @@ files:
 - definitions/checks/mongo/db_up.rb
 - definitions/checks/mongo/tools_installed.rb
 - definitions/checks/original_assets.rb
+- definitions/checks/pulpcore/db_up.rb
 - definitions/checks/puppet/provide_upgrade_guide.rb
 - definitions/checks/puppet/verify_no_empty_cacert_requests.rb
 - definitions/checks/remote_execution/verify_settings_file_already_exists.rb
+- definitions/checks/repositories/check_non_rh_repository.rb
 - definitions/checks/repositories/check_upstream_repository.rb
 - definitions/checks/repositories/validate.rb
 - definitions/checks/restore/validate_backup.rb
@@ -156,10 +158,12 @@ files:
 - definitions/checks/system_registration.rb
 - definitions/checks/version_locking_enabled.rb
 - definitions/checks/yum_exclude.rb
+- definitions/features/apache.rb
 - definitions/features/candlepin.rb
 - definitions/features/candlepin_database.rb
 - definitions/features/capsule.rb
 - definitions/features/cron.rb
+- definitions/features/dynflow_sidekiq.rb
 - definitions/features/foreman_1_11_x.rb
 - definitions/features/foreman_1_7_x.rb
 - definitions/features/foreman_database.rb
@@ -174,8 +178,11 @@ files:
 - definitions/features/iptables.rb
 - definitions/features/katello.rb
 - definitions/features/mongo.rb
-- definitions/features/pulp.rb
+- definitions/features/pulp2.rb
+- definitions/features/pulpcore.rb
+- definitions/features/pulpcore_database.rb
 - definitions/features/puppet_server.rb
+- definitions/features/redis.rb
 - definitions/features/satellite.rb
 - definitions/features/service.rb
 - definitions/features/sync_plans.rb
@@ -190,10 +197,12 @@ files:
 - definitions/procedures/backup/offline/candlepin_db.rb
 - definitions/procedures/backup/offline/foreman_db.rb
 - definitions/procedures/backup/offline/mongo.rb
+- definitions/procedures/backup/offline/pulpcore_db.rb
 - definitions/procedures/backup/online/candlepin_db.rb
 - definitions/procedures/backup/online/foreman_db.rb
 - definitions/procedures/backup/online/mongo.rb
 - definitions/procedures/backup/online/pg_global_objects.rb
+- definitions/procedures/backup/online/pulpcore_db.rb
 - definitions/procedures/backup/online/safety_confirmation.rb
 - definitions/procedures/backup/prepare_directory.rb
 - definitions/procedures/backup/pulp.rb
@@ -204,8 +213,11 @@ files:
 - definitions/procedures/backup/snapshot/mount_foreman_db.rb
 - definitions/procedures/backup/snapshot/mount_mongo.rb
 - definitions/procedures/backup/snapshot/mount_pulp.rb
+- definitions/procedures/backup/snapshot/mount_pulpcore_db.rb
 - definitions/procedures/backup/snapshot/prepare_mount.rb
 - definitions/procedures/candlepin/delete_orphaned_records_from_env_content.rb
+- definitions/procedures/content/prepare.rb
+- definitions/procedures/content/switchover.rb
 - definitions/procedures/crond/start.rb
 - definitions/procedures/crond/stop.rb
 - definitions/procedures/files/remove.rb
@@ -236,6 +248,7 @@ files:
 - definitions/procedures/packages/update_all_confirmation.rb
 - definitions/procedures/passenger_recycler.rb
 - definitions/procedures/pulp/migrate.rb
+- definitions/procedures/pulpcore/migrate.rb
 - definitions/procedures/puppet/delete_empty_ca_cert_request_files.rb
 - definitions/procedures/remote_execution/remove_existing_settingsd.rb
 - definitions/procedures/repositories/disable.rb
@@ -251,6 +264,7 @@ files:
 - definitions/procedures/restore/mongo_dump.rb
 - definitions/procedures/restore/pg_global_objects.rb
 - definitions/procedures/restore/postgres_owner.rb
+- definitions/procedures/restore/pulpcore_dump.rb
 - definitions/procedures/selinux/set_file_security.rb
 - definitions/procedures/service/base.rb
 - definitions/procedures/service/daemon_reload.rb
@@ -264,10 +278,15 @@ files:
 - definitions/procedures/sync_plans/disable.rb
 - definitions/procedures/sync_plans/enable.rb
 - definitions/scenarios/backup.rb
+- definitions/scenarios/content.rb
 - definitions/scenarios/maintenance_mode.rb
 - definitions/scenarios/packages.rb
 - definitions/scenarios/restore.rb
 - definitions/scenarios/services.rb
+- definitions/scenarios/upgrade_to_capsule_6_7.rb
+- definitions/scenarios/upgrade_to_capsule_6_7_z.rb
+- definitions/scenarios/upgrade_to_capsule_6_8.rb
+- definitions/scenarios/upgrade_to_capsule_6_8_z.rb
 - definitions/scenarios/upgrade_to_satellite_6_2.rb
 - definitions/scenarios/upgrade_to_satellite_6_2_z.rb
 - definitions/scenarios/upgrade_to_satellite_6_3.rb
@@ -280,6 +299,8 @@ files:
 - definitions/scenarios/upgrade_to_satellite_6_6_z.rb
 - definitions/scenarios/upgrade_to_satellite_6_7.rb
 - definitions/scenarios/upgrade_to_satellite_6_7_z.rb
+- definitions/scenarios/upgrade_to_satellite_6_8.rb
+- definitions/scenarios/upgrade_to_satellite_6_8_z.rb
 - extras/foreman-maintain.sh
 - extras/foreman_protector/foreman-protector.conf
 - extras/foreman_protector/foreman-protector.py
@@ -297,6 +318,7 @@ files:
 - lib/foreman_maintain/cli/advanced_command.rb
 - lib/foreman_maintain/cli/backup_command.rb
 - lib/foreman_maintain/cli/base.rb
+- lib/foreman_maintain/cli/content_command.rb
 - lib/foreman_maintain/cli/health_command.rb
 - lib/foreman_maintain/cli/maintenance_mode_command.rb
 - lib/foreman_maintain/cli/packages_command.rb

data/definitions/checks/check_epel_repository.rb

@@ -1,21 +0,0 @@
-class Checks::CheckEpelRepository < ForemanMaintain::Check
-  metadata do
-    label :check_epel_repository
-    description 'Check if EPEL repository enabled on system'
-    tags :pre_upgrade
-    confine do
-      feature(:instance).downstream
-    end
-  end
-
-  def run
-    with_spinner('Checking for presence of EPEL repository') do
-      assert(!epel_enabled?, 'System is subscribed to EPEL repository')
-    end
-  end
-
-  def epel_enabled?
-    system_repos = execute("yum repolist enabled -d 6 -e 0| grep -E 'Repo-baseurl|Repo-id'")
-    system_repos.to_s.match(/\bepel\b/i)
-  end
-end