foreman_maintain 1.3.0 → 1.3.2

data/definitions/procedures/backup/pulp.rb

@@ -10,7 +10,7 @@ module Procedures::Backup
       param :mount_dir, 'Snapshot mount directory'
 
       confine do
-        feature(:pulp2) || feature(:pulpcore_database)
+        feature(:pulpcore_database)
       end
     end
 
@@ -30,7 +30,7 @@ module Procedures::Backup
     private
 
     def any_pulp_feature
-      feature(:pulp2) || feature(:pulpcore_database)
+      feature(:pulpcore_database)
     end
 
     def pulp_backup
@@ -52,7 +52,7 @@ module Procedures::Backup
       dir = any_pulp_feature.find_marked_directory(mount_point)
       unless dir
         raise ForemanMaintain::Error::Fail,
-              "Pulp base directory not found in the mount point (#{mount_point})"
+          "Pulp base directory not found in the mount point (#{mount_point})"
       end
       dir
     end

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

@@ -8,7 +8,7 @@ module Procedures::Backup
       end
 
       def run
-        %w[pulp mongodb pgsql].each do |database|
+        %w[pulp pgsql].each do |database|
           mount_point = File.join(@mount_dir, database)
 
           if File.exist?(mount_point) && !execute("mount|grep #{mount_point}").empty?

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

@@ -23,12 +23,11 @@ module Procedures::Backup
       end
 
       def current_pulp_feature
-        feature(:pulp2) || feature(:pulpcore_database)
+        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)

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

@@ -8,7 +8,7 @@ module Procedures::Backup
         MountBase.common_params(self)
         param :skip, 'Skip Pulp content during backup'
         confine do
-          feature(:pulp2) || feature(:pulpcore_database)
+          feature(:pulpcore_database)
         end
       end
 
@@ -25,7 +25,7 @@ module Procedures::Backup
       end
 
       def current_pulp_feature
-        feature(:pulp2) || feature(:pulpcore_database)
+        feature(:pulpcore_database)
       end
     end
   end

data/definitions/procedures/foreman/fix_corrupted_roles.rb

@@ -36,9 +36,9 @@ module Procedures::Foreman
 
     def update_records(set)
       new_filter = create_filter set.first['role_id'],
-                                 set.first['search'],
-                                 set.first['taxonomy_search'],
-                                 set.first['override']
+        set.first['search'],
+        set.first['taxonomy_search'],
+        set.first['override']
       set.each do |item|
         destroy_filtering item
         next if !new_filter || new_filter.empty?

data/definitions/procedures/foreman_tasks/delete.rb

@@ -4,9 +4,9 @@ module Procedures::ForemanTasks
 
     metadata do
       param :state,
-            'In what state should the task be deleted.'\
-            " Possible values are #{ALLOWED_STATES_VALUES.join(', ')}",
-            :required => true, :allowed_values => ALLOWED_STATES_VALUES
+        'In what state should the task be deleted.'\
+        " Possible values are #{ALLOWED_STATES_VALUES.join(', ')}",
+        :required => true, :allowed_values => ALLOWED_STATES_VALUES
       description 'Delete tasks'
     end
 

data/definitions/procedures/hammer_setup.rb

@@ -5,7 +5,7 @@ class Procedures::HammerSetup < ForemanMaintain::Procedure
   end
 
   def run
-    if feature(:foreman_server) && feature(:foreman_server).services_running?
+    if feature(:foreman_server)&.services_running?
       puts 'Configuring Hammer CLI...'
       result = feature(:hammer).setup_admin_access
       logger.info 'Hammer was configured successfully.' if result

data/definitions/procedures/knowledge_base_article.rb

@@ -6,8 +6,8 @@ class Procedures::KnowledgeBaseArticle < ForemanMaintain::Procedure
       feature(:instance).downstream
     end
     param :doc,
-          'Document name required to select a correct article',
-          :required => true
+      'Document name required to select a correct article',
+      :required => true
     advanced_run false
   end
 
@@ -25,8 +25,7 @@ class Procedures::KnowledgeBaseArticle < ForemanMaintain::Procedure
     {
       'fix_cpdb_validate_failure' => 'https://access.redhat.com/solutions/3362821',
       'fix_db_migrate_failure_on_duplicate_roles' => 'https://access.redhat.com/solutions/3998941',
-      'upgrade_puppet_guide_for_sat63' => 'https://access.redhat.com/documentation/en-us/red_hat_satellite/6.3/html/upgrading_and_updating_red_hat_satellite/upgrading_puppet-1',
-      'many_fact_values' => 'https://access.redhat.com/solutions/4163891'
+      'many_fact_values' => 'https://access.redhat.com/solutions/4163891',
     }
   end
 end

data/definitions/procedures/packages/enable_modules.rb

@@ -3,7 +3,7 @@ module Procedures::Packages
     metadata do
       description 'Enable the given stream modules'
       confine do
-        package_manager.class.name == 'ForemanMaintain::PackageManager::Dnf'
+        package_manager.instance_of?(ForemanMaintain::PackageManager::Dnf)
       end
       param :module_names, 'Module names', :array => true, :required => true
       advanced_run false

data/definitions/procedures/packages/install.rb

@@ -6,7 +6,7 @@ module Procedures::Packages
       param :assumeyes, 'Do not ask for confirmation'
       param :force, 'Do not skip if package is installed', :flag => true, :default => false
       param :warn_on_errors, 'Do not interrupt scenario on failure',
-            :flag => true, :default => false
+        :flag => true, :default => false
     end
 
     def run

data/definitions/procedures/packages/uninstall.rb

@@ -5,7 +5,7 @@ module Procedures::Packages
       param :packages, 'List of packages to uninstall', :array => true
       param :assumeyes, 'Do not ask for confirmation'
       param :warn_on_errors, 'Do not interrupt scenario on failure',
-            :flag => true, :default => false
+        :flag => true, :default => false
     end
 
     def run

data/definitions/procedures/packages/update.rb

@@ -5,7 +5,7 @@ module Procedures::Packages
       param :assumeyes, 'Do not ask for confirmation'
       param :force, 'Do not skip if package is installed', :flag => true, :default => false
       param :warn_on_errors, 'Do not interrupt scenario on failure',
-            :flag => true, :default => false
+        :flag => true, :default => false
       param :yum_options, 'Extra yum options if any', :array => true, :default => []
     end
 
@@ -27,7 +27,11 @@ module Procedures::Packages
     end
 
     def description
-      "Update package(s) #{@packages.join(', ')}"
+      if @yum_options.include?('--downloadonly')
+        "Download package(s) #{@packages.join(', ')}"
+      else
+        "Update package(s) #{@packages.join(', ')}"
+      end
     end
   end
 end

data/definitions/procedures/pulpcore/migrate.rb

@@ -1,6 +1,7 @@
 module Procedures::Pulpcore
   class Migrate < ForemanMaintain::Procedure
     include ForemanMaintain::Concerns::SystemService
+    include ForemanMaintain::Concerns::PulpCommon
 
     metadata do
       description 'Migrate pulpcore db'
@@ -16,9 +17,7 @@ module Procedures::Pulpcore
         feature(:service).handle_services(spinner, 'stop', :only => pulp_services)
 
         spinner.update('Migrating pulpcore database')
-        execute!('sudo PULP_SETTINGS=/etc/pulp/settings.py '\
-          'DJANGO_SETTINGS_MODULE=pulpcore.app.settings '\
-          'pulpcore-manager migrate --noinput')
+        execute!(pulpcore_manager('migrate --noinput'))
       end
     end
   end

data/definitions/procedures/pulpcore/trim_rpm_changelogs.rb

@@ -1,6 +1,7 @@
 module Procedures::Pulpcore
   class TrimRpmChangelogs < ForemanMaintain::Procedure
     include ForemanMaintain::Concerns::SystemService
+    include ForemanMaintain::Concerns::PulpCommon
 
     metadata do
       description 'Trim RPM changelogs in the pulpcore db'
@@ -14,9 +15,7 @@ module Procedures::Pulpcore
         feature(:service).handle_services(spinner, 'start', :only => necessary_services)
 
         spinner.update('Trimming RPM changelogs')
-        execute!('sudo PULP_SETTINGS=/etc/pulp/settings.py '\
-          'DJANGO_SETTINGS_MODULE=pulpcore.app.settings '\
-          'pulpcore-manager rpm-trim-changelogs')
+        execute!(pulpcore_manager('rpm-trim-changelogs'))
       end
     end
   end

data/definitions/procedures/remote_execution/remove_existing_settingsd.rb

@@ -2,8 +2,8 @@ module Procedures::RemoteExecution
   class RemoveExistingSettingsd < ForemanMaintain::Procedure
     metadata do
       param :dirpath,
-            'Directory path for settings.d folder',
-            :required => true
+        'Directory path for settings.d folder',
+        :required => true
       description 'Remove existing settings.d directory before installer run.' \
         "\n The next run of the installer will re-create the directory properly."
       advanced_run false

data/definitions/procedures/repositories/enable.rb

@@ -3,7 +3,7 @@ module Procedures::Repositories
     metadata do
       param :repos, 'Array of repositories to enable'
       param :use_rhsm, 'Use RHSM to enable repository',
-            :flag => true, :default => false
+        :flag => true, :default => false
       description 'Enable repositories'
     end
     def run

data/definitions/procedures/repositories/setup.rb

@@ -6,8 +6,8 @@ module Procedures::Repositories
         feature(:instance).downstream || feature(:upstream)
       end
       param :version,
-            'Version for which repositories needs to be setup',
-            :required => true
+        'Version for which repositories needs to be setup',
+        :required => true
       run_once
     end
 

data/definitions/procedures/restore/candlepin_dump.rb

@@ -3,8 +3,8 @@ module Procedures::Restore
     metadata do
       description 'Restore candlepin postgresql dump from backup'
       param :backup_dir,
-            'Path to backup directory',
-            :required => true
+        'Path to backup directory',
+        :required => true
       preparation_steps { Checks::Candlepin::DBUp.new }
       confine do
         feature(:candlepin_database)

data/definitions/procedures/restore/configs.rb

@@ -4,8 +4,8 @@ module Procedures::Restore
       description 'Restore configs from backup'
 
       param :backup_dir,
-            'Path to backup directory',
-            :required => true
+        'Path to backup directory',
+        :required => true
     end
 
     def run
@@ -15,11 +15,9 @@ module Procedures::Restore
         clean_conflicting_data
         restore_configs(backup)
         reset_qpid_jrnls
-        reload_configs
       end
     end
 
-    # rubocop:disable  Metrics/MethodLength
     def restore_configs(backup)
       exclude = ForemanMaintain.available_features.each_with_object([]) do |feat, cfgs|
         if backup.online_backup?
@@ -35,16 +33,11 @@ module Procedures::Restore
         :directory => '/',
         :archive => backup.file_map[:config_files][:path],
         :gzip => true,
-        :exclude => exclude
+        :exclude => exclude,
       }
 
       feature(:tar).run(tar_options)
     end
-    # rubocop:enable  Metrics/MethodLength
-
-    def reload_configs
-      feature(:mongo).reload_db_config if feature(:mongo)
-    end
 
     private
 

data/definitions/procedures/restore/drop_databases.rb

@@ -4,8 +4,8 @@ module Procedures::Restore
       description 'Drop postgresql databases'
 
       param :backup_dir,
-            'Path to backup directory',
-            :required => true
+        'Path to backup directory',
+        :required => true
 
       confine do
         feature(:foreman_database) || feature(:candlepin_database) || feature(:pulpcore_database)

data/definitions/procedures/restore/extract_files.rb

@@ -4,8 +4,8 @@ module Procedures::Restore
       description 'Extract any existing tar files in backup'
 
       param :backup_dir,
-            'Path to backup directory',
-            :required => true
+        'Path to backup directory',
+        :required => true
     end
 
     def run
@@ -15,10 +15,6 @@ module Procedures::Restore
           spinner.update('Extracting pulp data')
           extract_pulp_data(backup)
         end
-        if backup.file_map[:mongo_data][:present]
-          spinner.update('Extracting mongo data')
-          extract_mongo_data(backup)
-        end
         if backup.file_map[:pgsql_data][:present]
           spinner.update('Extracting pgsql data')
           extract_pgsql_data(backup)
@@ -32,7 +28,7 @@ module Procedures::Restore
         :absolute_names => true,
         :listed_incremental => '/dev/null',
         :command => 'extract',
-        :directory => '/'
+        :directory => '/',
       }
     end
 
@@ -52,14 +48,6 @@ module Procedures::Restore
       feature(:tar).run(pulp_data_tar)
     end
 
-    def extract_mongo_data(backup)
-      mongo_data_tar = base_tar.merge(
-        :archive => backup.file_map[:mongo_data][:path],
-        :gzip => true
-      )
-      feature(:tar).run(mongo_data_tar)
-    end
-
     def any_database
       feature(:foreman_database) || feature(:candlepin_database) || feature(:pulpcore_database)
     end
@@ -67,8 +55,7 @@ module Procedures::Restore
     def extract_pgsql_data(backup)
       pgsql_data_tar = base_tar.merge(
         :archive => backup.file_map[:pgsql_data][:path],
-        :gzip => true,
-        :transform => any_database.restore_transform
+        :gzip => true
       )
       feature(:tar).run(pgsql_data_tar)
       del_data_dir_param if el?

data/definitions/procedures/restore/foreman_dump.rb

@@ -3,8 +3,8 @@ module Procedures::Restore
     metadata do
       description 'Restore foreman postgresql dump from backup'
       param :backup_dir,
-            'Path to backup directory',
-            :required => true
+        'Path to backup directory',
+        :required => true
       preparation_steps { Checks::Foreman::DBUp.new }
       confine do
         feature(:foreman_database)

data/definitions/procedures/restore/installer_reset.rb

@@ -20,8 +20,7 @@ module Procedures::Restore
       # We always disable system checks to avoid unnecessary errors. The installer should have
       # already ran since this is to be run on an existing system, which means installer checks
       # has already been skipped
-      if feature(:foreman_proxy) &&
-         feature(:foreman_proxy).with_content? &&
+      if feature(:foreman_proxy)&.with_content? &&
          check_max_version('foreman-installer', '3.4')
         installer << '--disable-system-checks '
       end

data/definitions/procedures/restore/postgres_owner.rb

@@ -5,8 +5,8 @@ module Procedures::Restore
       description 'Make postgres owner of backup directory'
 
       param :backup_dir,
-            'Path to backup directory',
-            :required => true
+        'Path to backup directory',
+        :required => true
     end
 
     def run

data/definitions/procedures/restore/pulpcore_dump.rb

@@ -3,8 +3,8 @@ module Procedures::Restore
     metadata do
       description 'Restore pulpcore postgresql dump from backup'
       param :backup_dir,
-            'Path to backup directory',
-            :required => true
+        'Path to backup directory',
+        :required => true
       preparation_steps { Checks::Pulpcore::DBUp.new }
       confine do
         feature(:pulpcore_database)

data/definitions/procedures/selinux/set_file_security.rb

@@ -4,8 +4,8 @@ module Procedures::Selinux
       description 'Setting file security'
 
       param :incremental_backup,
-            'Is the backup incremental?',
-            :required => true
+        'Is the backup incremental?',
+        :required => true
       manual_detection
       confine do
         File.directory?('/sys/fs/selinux')

data/definitions/procedures/service/restart.rb

@@ -6,15 +6,14 @@ module Procedures::Service
       description 'Restart applicable services'
       Base.common_params(self)
       param :wait_for_server_response,
-            'Wait for server ping to return successfully before terminating'
+        'Wait for server ping to return successfully before terminating'
     end
 
     RETRIES_FOR_SERVICES_RESTART = 5
     PING_RETRY_INTERVAL = 30
 
     def run
-      run_service_action('stop', common_options)
-      run_service_action('start', common_options)
+      run_service_action('restart', common_options)
       server_ping_retry if @wait_for_server_response
     end