foreman_maintain 0.7.2 → 0.7.8

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: ede9ac694f3aa2331891b0a5a8d6e2d16881baa2705cedda1d6665e2f525617c
-  data.tar.gz: ee459a09c76aeac0d0e62a337e30830b7f93f70a6a48111e81d7af1eed2f6aa0
+  metadata.gz: ae46ef9452f9bbb61d9f453a1d3aba399aa39aad83c8340ba2ba7129196eb6ec
+  data.tar.gz: daae5660ce5a676c230b6ef4360e7341f3fdb5d82ce46cc53a0ac3596926ab94
 SHA512:
-  metadata.gz: e41953a3ec03c60f1a2ee2ab573db15a5fdbfddebf438abbf7a93be1b9512401a430ca13c3f870d010275f3b78d01decc404a00f92cd6087e20fcb8fd057cca4
-  data.tar.gz: 25745f4026a790b816ce52dd378a1747cea9d9598b3167320cb6d4cc3fb531998589371c8512146c7b35b33aa6b3b632aa9af50b005834c416cda0d2c6b47523
+  metadata.gz: 62d82ea9a9d4ece0797e5872b8b0a551940864965416b23f3dfa7a7b054c68b8cd684d76f2cfd85532d6c744ab9f88942b03a8282a43aac96ae2282cb2a715ec
+  data.tar.gz: 00f495d544d54df325d9e0541a0b206dab5fbd2a2f5930e5d17eb86173d450e92926cc41c74379fda20a878ed634c8e473abfaf440d0034ae6c0c44e50c88fe5

data/definitions/checks/candlepin/db_up.rb

@@ -9,15 +9,19 @@ module Checks
 
       def run
         status = false
-        with_spinner('Checking connection to the Candlepin DB') do
-          status = feature(:candlepin_database).ping
+        if feature(:candlepin_database).psql_cmd_available?
+          with_spinner('Checking connection to the Candlepin DB') do
+            status = feature(:candlepin_database).ping
+          end
+          assert(status, 'Candlepin DB is not responding. ' \
+            'It needs to be up and running to perform the following steps',
+                 :next_steps => start_pgsql)
+        else
+          feature(:candlepin_database).raise_psql_missing_error
         end
-        assert(status, 'Candlepin DB is not responding. ' \
-          'It needs to be up and running to perform the following steps',
-               :next_steps => next_steps)
       end
 
-      def next_steps
+      def start_pgsql
         if feature(:candlepin_database).local?
           [Procedures::Service::Start.new(:only => 'postgresql')]
         else

data/definitions/checks/foreman/db_up.rb

@@ -9,15 +9,19 @@ module Checks
 
       def run
         status = false
-        with_spinner('Checking connection to the Foreman DB') do
-          status = feature(:foreman_database).ping
+        if feature(:foreman_database).psql_cmd_available?
+          with_spinner('Checking connection to the Foreman DB') do
+            status = feature(:foreman_database).ping
+          end
+          assert(status, 'Foreman DB is not responding. ' \
+            'It needs to be up and running to perform the following steps',
+                 :next_steps => start_pgsql)
+        else
+          feature(:foreman_database).raise_psql_missing_error
         end
-        assert(status, 'Foreman DB is not responding. ' \
-          'It needs to be up and running to perform the following steps',
-               :next_steps => next_steps)
       end
 
-      def next_steps
+      def start_pgsql
         if feature(:foreman_database).local?
           [Procedures::Service::Start.new(:only => 'postgresql')]
         else

data/definitions/checks/foreman_tasks/not_paused.rb

@@ -9,23 +9,20 @@ module Checks::ForemanTasks
     end
 
     def run
-      paused_tasks_count = feature(:foreman_tasks).paused_tasks_count(ignored_tasks)
+      paused_tasks_count = feature(:foreman_tasks).paused_tasks_count()
       assert(paused_tasks_count == 0,
              "There are currently #{paused_tasks_count} paused tasks in the system",
-             :next_steps =>
-               [Procedures::ForemanTasks::Resume.new,
-                Procedures::ForemanTasks::UiInvestigate.new('search_query' => scoped_search_query)])
+             :next_steps => next_procedures)
     end
 
-    # Note: this is for UI link generation only: we are not using scoped search for querying
-    # the tasks itself as we use direct SQL instead
-    def scoped_search_query
-      "state = paused AND label !^(#{ignored_tasks.join(' ')})"
-    end
-
-    def ignored_tasks
-      %w[Actions::Candlepin::ListenOnCandlepinEvents
-         Actions::Katello::EventQueue::Monitor]
+    def next_procedures
+      if assumeyes?
+        return [Procedures::ForemanTasks::Resume.new,
+                Procedures::ForemanTasks::Delete.new(:state => :paused)]
+      end
+      [Procedures::ForemanTasks::Resume.new,
+       Procedures::ForemanTasks::Delete.new(:state => :paused),
+       Procedures::ForemanTasks::UiInvestigate.new('search_query' => 'state = paused')]
     end
   end
 end

data/definitions/checks/mongo/db_up.rb

@@ -9,15 +9,19 @@ module Checks
 
       def run
         status = false
-        with_spinner('Checking connection to the Mongo DB') do
-          status = feature(:mongo).ping
+        if feature(:mongo).mongo_cmd_available?
+          with_spinner('Checking connection to the Mongo DB') do
+            status = feature(:mongo).ping
+          end
+          assert(status, 'Mongo DB is not responding. ' \
+            'It needs to be up and running to perform the following steps.',
+                 :next_steps => start_mongodb)
+        else
+          feature(:mongo).raise_mongo_client_missing_error
         end
-        assert(status, 'Mongo DB is not responding. ' \
-          'It needs to be up and running to perform the following steps.',
-               :next_steps => next_steps)
       end
 
-      def next_steps
+      def start_mongodb
         if feature(:mongo).local?
           [Procedures::Service::Start.new(:only => feature(:mongo).services)]
         else

data/definitions/features/dynflow_sidekiq.rb

@@ -7,10 +7,6 @@ class Features::DynflowSidekiq < ForemanMaintain::Feature
     end
   end
 
-  def services
-    service_names.map { |service| system_service service, instance_priority(service) }
-  end
-
   def config_files
     # Workaround until foreman-installer can deploy scaled workers
     service_symlinks = configured_instances.map do |service|
@@ -22,6 +18,13 @@ class Features::DynflowSidekiq < ForemanMaintain::Feature
     ].flatten
   end
 
+  def services
+    service_names.map do |service|
+      system_service service, instance_priority(service),
+                     :instance_parent_unit => 'dynflow-sidekiq@'
+    end
+  end
+
   private
 
   def instance_priority(instance)

data/definitions/features/foreman_tasks.rb

@@ -89,16 +89,18 @@ class Features::ForemanTasks < ForemanMaintain::Feature
 
     if state == :old
       old_tasks_condition
+    elsif state == :paused
+      paused_tasks_condition
     else
       tasks_condition(state)
     end
   end
 
   def resume_task_using_hammer
-    if check_min_version('satellite', '6.8')
-      feature(:hammer).run('task resume --search ""')
+    if feature(:satellite) && feature(:satellite).current_minor_version == '6.8'
+      feature(:hammer).run('task resume --search "" --fields="Total tasks resumed"')
     else
-      feature(:hammer).run('task resume')
+      feature(:hammer).run('task resume --fields="Total tasks resumed"')
     end
   end
 
@@ -180,6 +182,10 @@ class Features::ForemanTasks < ForemanMaintain::Feature
        "foreman_tasks_tasks.started_at < CURRENT_DATE - INTERVAL '#{MIN_AGE} days'"
   end
 
+  def paused_tasks_condition(state = "'paused'")
+    "foreman_tasks_tasks.state IN (#{state})"
+  end
+
   def prepare_for_backup(state)
     dir = backup_dir(state)
     execute("mkdir -p #{dir}")
@@ -197,6 +203,6 @@ class Features::ForemanTasks < ForemanMaintain::Feature
   end
 
   def valid(state)
-    %w[old planning pending].include?(state.to_s)
+    %w[old planning pending paused].include?(state.to_s)
   end
 end

data/definitions/features/mongo.rb

@@ -140,6 +140,16 @@ class Features::Mongo < ForemanMaintain::Feature
     end
   end
 
+  def mongo_cmd_available?
+    exit_status, _output = execute_with_status('which mongo')
+    exit_status == 0
+  end
+
+  def raise_mongo_client_missing_error
+    raise ForemanMaintain::Error::Fail, 'The mongo command not found.'\
+                                  ' Make sure system has mongo utility installed.'
+  end
+
   private
 
   def load_mongo_core_default(version)

data/definitions/features/pulpcore.rb

@@ -11,18 +11,19 @@ class Features::Pulpcore < ForemanMaintain::Feature
   end
 
   def services
-    pulpcore_common_services + [
+    self.class.pulpcore_common_services + [
+      system_service('rh-redis5-redis', 5),
       system_service('pulpcore-worker@*', 20, :all => true, :skip_enablement => true),
       system_service('httpd', 30)
     ]
   end
 
-  def pulpcore_migration_services
+  def self.pulpcore_migration_services
     pulpcore_common_services + [
-      system_service('pulpcore-worker@1', 20),
-      system_service('pulpcore-worker@2', 20),
-      system_service('pulpcore-worker@3', 20),
-      system_service('pulpcore-worker@4', 20)
+      ForemanMaintain::Utils.system_service('pulpcore-worker@1', 20),
+      ForemanMaintain::Utils.system_service('pulpcore-worker@2', 20),
+      ForemanMaintain::Utils.system_service('pulpcore-worker@3', 20),
+      ForemanMaintain::Utils.system_service('pulpcore-worker@4', 20)
     ]
   end
 
@@ -32,14 +33,11 @@ class Features::Pulpcore < ForemanMaintain::Feature
     ]
   end
 
-  private
-
-  def pulpcore_common_services
+  def self.pulpcore_common_services
     [
-      system_service('rh-redis5-redis', 5),
-      system_service('pulpcore-api', 10, :socket => 'pulpcore-api'),
-      system_service('pulpcore-content', 10, :socket => 'pulpcore-content'),
-      system_service('pulpcore-resource-manager', 10)
+      ForemanMaintain::Utils.system_service('pulpcore-api', 10, :socket => 'pulpcore-api'),
+      ForemanMaintain::Utils.system_service('pulpcore-content', 10, :socket => 'pulpcore-content'),
+      ForemanMaintain::Utils.system_service('pulpcore-resource-manager', 10)
     ]
   end
 end

data/definitions/features/service.rb

@@ -8,7 +8,6 @@ class Features::Service < ForemanMaintain::Feature
     # { :only => ["httpd"] }
     # { :exclude => ["pulp-workers", "tomcat"] }
     # { :include => ["crond"] }
-
     if feature(:instance).downstream && feature(:instance).downstream.less_than_version?('6.3')
       use_katello_service(action, options)
     else
@@ -27,11 +26,12 @@ class Features::Service < ForemanMaintain::Feature
   end
 
   def filtered_services(options)
-    service_list = include_unregistered_services(existing_services, options[:include])
-    service_list = filter_services(service_list, options)
-    raise 'No services found matching your parameters' unless service_list.any?
+    services = include_unregistered_services(existing_services, options[:include])
+    services = filter_services(services, options)
+    raise 'No services found matching your parameters' unless services.any?
+    return services unless options[:reverse]
 
-    options[:reverse] ? service_list.reverse : service_list
+    Hash[services.sort_by { |k, _| k.to_i }.reverse]
   end
 
   def action_noun(action)
@@ -61,22 +61,31 @@ class Features::Service < ForemanMaintain::Feature
   def run_action_on_services(action, options, spinner)
     status = 0
     failed_services = []
-
-    filtered_services(options).each do |service|
-      spinner.update("#{action_noun(action)} #{service}")
-      item_status, output = service.send(action.to_sym)
-
-      formatted = format_status(output, item_status, options)
-      puts formatted unless formatted.empty?
-
-      if item_status > 0
-        status = item_status
-        failed_services << service
+    filtered_services(options).each_value do |group|
+      fork_threads_for_services(action, group, spinner).each do |service, status_and_output|
+        spinner.update("#{action_noun(action)} #{service}") if action == 'status'
+        item_status, output = status_and_output
+        formatted = format_status(output, item_status, options)
+        puts formatted unless formatted.empty?
+
+        if item_status > 0
+          status = item_status
+          failed_services << service
+        end
       end
     end
     [status, failed_services]
   end
 
+  def fork_threads_for_services(action, services, spinner)
+    services_and_statuses = []
+    services.each do |service|
+      spinner.update("#{action_noun(action)} #{service}") if action != 'status'
+      services_and_statuses << [service, Thread.new { service.send(action.to_sym) }]
+    end
+    services_and_statuses.map! { |service, status| [service, status.value] }
+  end
+
   def format_status(output, exit_code, options)
     status = ''
     if !options[:failing] || exit_code > 0
@@ -119,7 +128,7 @@ class Features::Service < ForemanMaintain::Feature
     end
 
     service_list = extend_service_list_with_sockets(service_list, options)
-    service_list.sort
+    service_list.group_by(&:priority).to_h
   end
 
   def include_unregistered_services(service_list, services_filter)

data/definitions/procedures/backup/online/safety_confirmation.rb

@@ -4,11 +4,12 @@ module Procedures::Backup
       metadata do
         description 'Data consistency warning'
         tags :backup
-        param :include_db_dumps
+        param :include_db_dumps, 'Are database dumps included in backup', :flag => true,
+                                                                          :default => false
       end
 
       def run
-        answer = ask_decision(warning_message(@include_db_dumps), 'y(yes), q(quit)')
+        answer = ask_decision(warning_message(@include_db_dumps), actions_msg: 'y(yes), q(quit)')
         abort! unless answer == :yes
       end
 

data/definitions/procedures/content/migration_reset.rb

@@ -0,0 +1,12 @@
+module Procedures::Content
+  class MigrationReset < ForemanMaintain::Procedure
+    metadata do
+      description 'Reset the Pulp 2 to Pulp 3 migration data (pre-switchover)'
+      for_feature :pulpcore
+    end
+
+    def run
+      puts execute!('foreman-rake katello:pulp3_migration_reset')
+    end
+  end
+end

data/definitions/procedures/foreman_tasks/delete.rb

@@ -1,6 +1,6 @@
 module Procedures::ForemanTasks
   class Delete < ForemanMaintain::Procedure
-    ALLOWED_STATES_VALUES = %w[old planning pending].freeze
+    ALLOWED_STATES_VALUES = %w[old planning pending paused].freeze
 
     metadata do
       param :state,
@@ -19,12 +19,11 @@ module Procedures::ForemanTasks
           feature(:foreman_tasks).backup_tasks(@state) do |backup_progress|
             spinner.update backup_progress
           end
-
-          spinner.update "Deleting #{@state} tasks [running]"
+          spinner.update "Deleting #{count_tasks_before} #{@state} tasks [running]"
           count_tasks_later = feature(:foreman_tasks).delete(@state)
           spinner.update "Deleting #{@state} tasks [DONE]"
           spinner.update(
-            "Deleted #{@state} stopped and paused tasks: #{count_tasks_before - count_tasks_later}"
+            "Deleted #{@state} tasks: #{count_tasks_before - count_tasks_later}"
           )
         end
       end

data/definitions/procedures/foreman_tasks/resume.rb

@@ -6,8 +6,13 @@ module Procedures::ForemanTasks
       description 'Resume paused tasks'
     end
 
+    WAIT_TIME = 30
+
     def run
       output << feature(:foreman_tasks).resume_task_using_hammer
+      with_spinner('Waiting 30 seconds for resumed tasks to start.') do
+        sleep WAIT_TIME
+      end
     end
   end
 end

data/definitions/procedures/prep_6_10_upgrade.rb

@@ -3,8 +3,7 @@ class Procedures::Prep610Upgrade < ForemanMaintain::Procedure
     description 'Preparations for the Satellite 6.10 upgrade'
 
     confine do
-      ::Scenarios.const_defined?('Satellite_6_10') &&
-        feature(:satellite) &&
+      feature(:satellite) &&
         feature(:satellite).current_minor_version == '6.9'
     end
   end
@@ -18,7 +17,6 @@ class Procedures::Prep610Upgrade < ForemanMaintain::Procedure
       execute!('find /var/lib/pulp/content -type d -perm -g-s -exec chmod g+s {} \;')
       spinner.update('$ chown -R :pulp /var/lib/pulp/content')
       FileUtils.chown_R nil, 'pulp', '/var/lib/pulp/content'
-      # TODO: Install Pulp 3 without starting services?
     end
   end
 

data/definitions/procedures/pulp/remove.rb

@@ -0,0 +1,87 @@
+module Procedures::Pulp
+  class Remove < ForemanMaintain::Procedure
+    metadata do
+      description 'Remove pulp2'
+
+      confine do
+        check_min_version('katello-common', '4.0')
+      end
+    end
+
+    def sys
+      ForemanMaintain::Utils::SystemHelpers.new
+    end
+
+    def pulp_data_dirs
+      [
+        '/var/lib/pulp/published',
+        '/var/lib/pulp/content',
+        '/var/lib/pulp/importers',
+        '/var/lib/pulp/uploads',
+        '/var/lib/mongodb/'
+      ]
+    end
+
+    def pulp_packages
+      [
+        'pulp-server', 'python-pulp-streamer', 'pulp-puppet-plugins',
+        'python-pulp-rpm-common', 'python-pulp-common',
+        'pulp-selinux', 'python-pulp-oid_validation',
+        'python-pulp-puppet-common', 'python-pulp-repoauth',
+        'pulp-rpm-plugins', 'python-blinker', 'python-celery',
+        'python-django', 'python-isodate', 'python-ldap',
+        'python-mongoengine', 'python-nectar', 'python-oauth2',
+        'python-pymongo'
+      ]
+    end
+
+    def data_dir_removal_cmds
+      pulp_data_dirs.collect { |dir| "rm -rf #{dir}" }
+    end
+
+    def ask_to_proceed(rm_cmds)
+      question = "\nWARNING: All pulp2 packages will be removed with the following commands:\n" \
+        "\n# yum remove #{pulp_packages.join('  ')}" \
+        "\n# yum remove rh-mongodb34-*" \
+        "\n\nAll pulp2 data will be removed.\n"
+      question += rm_cmds.collect { |cmd| "\n# #{cmd}" }.join
+      question += "\n\nDo you want to proceed?"
+      answer = ask_decision(question, actions_msg: 'y(yes), q(quit)')
+      abort! if answer != :yes
+    end
+
+    def run
+      rm_cmds = data_dir_removal_cmds
+      ask_to_proceed(rm_cmds)
+
+      remove_pulp
+
+      remove_mongo
+
+      delete_pulp_data(rm_cmds)
+    end
+
+    def remove_pulp
+      with_spinner('Removing pulp2 packages') do
+        packages_action(:remove, pulp_packages, :assumeyes => true)
+      end
+    end
+
+    def remove_mongo
+      with_spinner('Removing mongo packages') do
+        packages_action(:remove, ['rh-mongodb34-*'], :assumeyes => true)
+      end
+    end
+
+    def delete_pulp_data(rm_cmds)
+      with_spinner('Deleting pulp2 data directories') do |spinner|
+        rm_cmds.each do |cmd|
+          if File.directory?(cmd.split[2])
+            execute!(cmd)
+          end
+        end
+        spinner.update('Done deleting pulp2 data directories')
+      end
+    end
+  end
+end

data/definitions/procedures/service/base.rb

@@ -18,7 +18,6 @@ module Procedures
         puts "\n#{action_noun} the following service(s):"
         services = feature(:service).filtered_services(options)
         print_services(services)
-
         with_spinner('') do |spinner|
           feature(:service).handle_services(spinner, action, options)
         end
@@ -31,7 +30,7 @@ module Procedures
       private
 
       def print_services(services)
-        puts services.map(&:to_s).join(', ')
+        puts services.values.flatten(1).join(', ')
       end
     end
   end

data/definitions/procedures/service/list.rb

@@ -9,6 +9,7 @@ module Procedures::Service
 
     def run
       services = feature(:service).filtered_services(common_options)
+      services = services.values.flatten(1)
       unit_files = unit_files_list(services)
       puts unit_files + "\n"
       puts 'All services listed'
@@ -16,12 +17,22 @@ module Procedures::Service
 
     def unit_files_list(services)
       if systemd_installed?
-        regex = services.map { |service| "^#{service.name}.service" }.join('\|')
-        execute("systemctl list-unit-files | grep '#{regex}'")
+        execute("systemctl list-unit-files --type=service | \
+                 grep '#{build_regex_for_services(services)}'")
       else
         regex = services.map { |service| "^#{service.name} " }.join('\|')
         execute("chkconfig --list 2>&1 | grep '#{regex}'")
       end
     end
+
+    def build_regex_for_services(services)
+      services.map do |service|
+        if service.respond_to?(:instance_parent_unit) && service.instance_parent_unit
+          "^#{service.instance_parent_unit}.service"
+        else
+          "^#{service.name}.service"
+        end
+      end.join('\|')
+    end
   end
 end

data/definitions/scenarios/backup.rb

@@ -94,6 +94,8 @@ module ForemanMaintain::Scenarios
                   Procedures::Backup::Snapshot::MountPulp => :skip)
       context.map(:tar_volume_size,
                   Procedures::Backup::Pulp => :tar_volume_size)
+      context.map(:include_db_dumps,
+                  Procedures::Backup::Online::SafetyConfirmation => :include_db_dumps)
     end
     # rubocop:enable  Metrics/MethodLength
 

data/definitions/scenarios/content.rb

@@ -1,6 +1,23 @@
 module ForemanMaintain::Scenarios
   module Content
-    class Prepare < ForemanMaintain::Scenario
+    class ContentBase < ForemanMaintain::Scenario
+      def enable_and_start_services
+        add_step(Procedures::Service::Start)
+        add_step(Procedures::Service::Enable.
+                 new(:only => Features::Pulpcore.pulpcore_migration_services))
+        add_step(Procedures::Service::Start.
+                 new(:only => Features::Pulpcore.pulpcore_migration_services))
+      end
+
+      def disable_and_stop_services
+        add_step(Procedures::Service::Stop.
+                 new(:only => Features::Pulpcore.pulpcore_migration_services))
+        add_step(Procedures::Service::Disable.
+                 new(:only => Features::Pulpcore.pulpcore_migration_services))
+      end
+    end
+
+    class Prepare < ContentBase
       metadata do
         label :content_prepare
         description 'Prepare content for Pulp 3'
@@ -12,28 +29,13 @@ module ForemanMaintain::Scenarios
           enable_and_start_services
           add_step(Procedures::Content::Prepare)
           disable_and_stop_services
+        elsif !feature(:satellite)
+          add_step(Procedures::Content::Prepare)
         end
       end
-
-      private
-
-      def enable_and_start_services
-        add_step(Procedures::Service::Start)
-        add_step(Procedures::Service::Enable.
-                 new(:only => feature(:pulpcore).pulpcore_migration_services))
-        add_step(Procedures::Service::Start.
-                 new(:only => feature(:pulpcore).pulpcore_migration_services))
-      end
-
-      def disable_and_stop_services
-        add_step(Procedures::Service::Stop.
-                 new(:only => feature(:pulpcore).pulpcore_migration_services))
-        add_step(Procedures::Service::Disable.
-                 new(:only => feature(:pulpcore).pulpcore_migration_services))
-      end
     end
 
-    class Switchover < ForemanMaintain::Scenario
+    class Switchover < ContentBase
       metadata do
         label :content_switchover
         description 'Switch support for certain content from Pulp 2 to Pulp 3'
@@ -49,7 +51,7 @@ module ForemanMaintain::Scenarios
       end
     end
 
-    class PrepareAbort < ForemanMaintain::Scenario
+    class PrepareAbort < ContentBase
       metadata do
         label :content_prepare_abort
         description 'Abort all running Pulp 2 to Pulp 3 migration tasks'
@@ -57,13 +59,13 @@ module ForemanMaintain::Scenarios
       end
 
       def compose
-        if feature(:satellite) && feature(:satellite).at_least_version?('6.9')
+        if !feature(:satellite) || feature(:satellite).at_least_version?('6.9')
           add_step(Procedures::Content::PrepareAbort)
         end
       end
     end
 
-    class MigrationStats < ForemanMaintain::Scenario
+    class MigrationStats < ContentBase
       metadata do
         label :content_migration_stats
         description 'Retrieve Pulp 2 to Pulp 3 migration statistics'
@@ -71,10 +73,40 @@ module ForemanMaintain::Scenarios
       end
 
       def compose
-        if feature(:satellite) && feature(:satellite).at_least_version?('6.9')
+        if !feature(:satellite) || feature(:satellite).at_least_version?('6.9')
           add_step(Procedures::Content::MigrationStats)
         end
       end
     end
+
+    class MigrationReset < ContentBase
+      metadata do
+        label :content_migration_reset
+        description 'Reset the Pulp 2 to Pulp 3 migration data (pre-switchover)'
+        manual_detection
+      end
+
+      def compose
+        if feature(:satellite) && feature(:satellite).at_least_version?('6.9')
+          enable_and_start_services
+          add_step(Procedures::Content::MigrationReset)
+          disable_and_stop_services
+        elsif !feature(:satellite)
+          add_step(Procedures::Content::MigrationReset)
+        end
+      end
+    end
+
+    class RemovePulp2 < ContentBase
+      metadata do
+        label :content_remove_pulp2
+        description 'Remove Pulp2 and mongodb packages and data'
+        manual_detection
+      end
+
+      def compose
+        add_step_with_context(Procedures::Pulp::Remove)
+      end
+    end
   end
 end

data/definitions/scenarios/restore.rb

@@ -103,7 +103,7 @@ module ForemanMaintain::Scenarios
 
   class RestoreRescue < ForemanMaintain::Scenario
     metadata do
-      description 'Resuce Restore backup'
+      description 'Rescue Restore backup'
       manual_detection
     end
 

data/lib/foreman_maintain/cli.rb

@@ -27,9 +27,8 @@ module ForemanMaintain
       subcommand 'content', 'Content related commands', ContentCommand
       subcommand 'maintenance-mode', 'Control maintenance-mode for application',
                  MaintenanceModeCommand
-      if ::Scenarios.const_defined?('Satellite_6_10') &&
-         ForemanMaintain.detector.feature('satellite') &&
-         ForemanMaintain.detector.feature('satellite').current_minor_version == '6.9'
+      if ForemanMaintain.detector.feature(:satellite) &&
+         ForemanMaintain.detector.feature(:satellite).current_minor_version == '6.9'
         subcommand 'prep-6.10-upgrade', 'Preparations for the Satellite 6.10 upgrade' do
           def execute
             run_scenarios_and_exit(Scenarios::Prep610Upgrade.new)

data/lib/foreman_maintain/cli/content_command.rb

@@ -27,6 +27,18 @@ module ForemanMaintain
           run_scenarios_and_exit(Scenarios::Content::MigrationStats.new)
         end
       end
+
+      subcommand 'migration-reset', 'Reset the Pulp 2 to Pulp 3 migration data (pre-switchover)' do
+        def execute
+          run_scenarios_and_exit(Scenarios::Content::MigrationReset.new)
+        end
+      end
+
+      subcommand 'remove-pulp2', 'Remove pulp2 and mongodb packages and data' do
+        def execute
+          run_scenarios_and_exit(Scenarios::Content::RemovePulp2.new)
+        end
+      end
     end
   end
 end

data/lib/foreman_maintain/cli/upgrade_command.rb

@@ -56,6 +56,7 @@ module ForemanMaintain
         disable_self_upgrade_option
 
         def execute
+          ForemanMaintain.validate_downstream_packages
           ForemanMaintain.perform_self_upgrade unless disable_self_upgrade?
           print_versions(UpgradeRunner.available_targets)
         end

data/lib/foreman_maintain/concerns/base_database.rb

@@ -119,6 +119,7 @@ module ForemanMaintain
         SQL
         result = query(sql)
         return false if result.nil? || (result && result.empty?)
+
         result.first['exists'].eql?('t')
       end
 
@@ -161,6 +162,16 @@ module ForemanMaintain
         end
       end
 
+      def psql_cmd_available?
+        exit_status, _output = execute_with_status('which psql')
+        exit_status == 0
+      end
+
+      def raise_psql_missing_error
+        raise Error::Fail, 'The psql command not found.'\
+                ' Make sure system has psql utility installed.'
+      end
+
       private
 
       def base_command(config, command = 'psql')

data/lib/foreman_maintain/reporter/cli_reporter.rb

@@ -67,6 +67,7 @@ module ForemanMaintain
         end
       end
 
+      attr_accessor :select_option_counter
       attr_reader :last_line, :max_length
 
       def initialize(stdout = STDOUT, stdin = STDIN, options = {})
@@ -81,6 +82,7 @@ module ForemanMaintain
         @spinner = Spinner.new(self)
         @spinner.start_spinner if @stdout.tty?
         @last_line = ''
+        @select_option_counter = 0
       end
 
       def before_scenario_starts(scenario)
@@ -212,8 +214,10 @@ module ForemanMaintain
       # rubocop:disable Metrics/MethodLength
       def ask_to_select(message, steps, run_strategy)
         if assumeyes?
-          puts('(assuming first option)')
-          return steps.first
+          step = steps[@select_option_counter]
+          @select_option_counter += 1
+          puts("(assuming option #{@select_option_counter})")
+          return step
         end
 
         until_valid_decision do

data/lib/foreman_maintain/runner.rb

@@ -18,6 +18,7 @@ module ForemanMaintain
       @last_scenario = nil
       @last_scenario_continuation_confirmed = false
       @exit_code = 0
+      @procedure_step_counter = 0
     end
 
     def quit?
@@ -143,14 +144,16 @@ module ForemanMaintain
 
     # rubocop:disable  Metrics/MethodLength
     def ask_about_offered_steps(step, scenario)
-      if assumeyes? && rerun_check?(step)
-        @reporter.puts 'Check still failing after attempt to fix. Skipping'
-        return :no
-      end
       if step.next_steps && !step.next_steps.empty?
         @last_decision_step = step
+        @procedure_step_counter += 1
         steps = step.next_steps.map(&:ensure_instance)
-
+        if assumeyes? && @procedure_step_counter > steps.length
+          @procedure_step_counter = 0
+          @reporter.select_option_counter = 0
+          @reporter.puts 'Check still failing after attempt to fix. Skipping'
+          return :no
+        end
         decision = @reporter.on_next_steps(steps, scenario.run_strategy)
         case decision
         when :quit

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

@@ -1,16 +1,17 @@
 module ForemanMaintain::Utils
   module Service
     class Systemd < Abstract
+      attr_reader :instance_parent_unit
       def initialize(name, priority, options = {})
         super
         @sys = SystemHelpers.new
+        @instance_parent_unit = options.fetch(:instance_parent_unit, nil)
       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

data/lib/foreman_maintain/version.rb

@@ -1,3 +1,3 @@
 module ForemanMaintain
-  VERSION = '0.7.2'.freeze
+  VERSION = '0.7.8'.freeze
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: foreman_maintain
 version: !ruby/object:Gem::Version
-  version: 0.7.2
+  version: 0.7.8
 platform: ruby
 authors:
 - Ivan Nečas
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2020-12-23 00:00:00.000000000 Z
+date: 2021-03-22 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: clamp
@@ -222,6 +222,7 @@ files:
 - 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/migration_reset.rb
 - definitions/procedures/content/migration_stats.rb
 - definitions/procedures/content/prepare.rb
 - definitions/procedures/content/prepare_abort.rb
@@ -259,6 +260,7 @@ files:
 - definitions/procedures/passenger_recycler.rb
 - definitions/procedures/prep_6_10_upgrade.rb
 - definitions/procedures/pulp/migrate.rb
+- definitions/procedures/pulp/remove.rb
 - definitions/procedures/pulpcore/migrate.rb
 - definitions/procedures/puppet/delete_empty_ca_cert_request_files.rb
 - definitions/procedures/remote_execution/remove_existing_settingsd.rb
@@ -416,7 +418,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.0.3
+rubygems_version: 3.2.3
 signing_key: 
 specification_version: 4
 summary: Foreman maintenance tool belt