foreman_maintain 0.5.4 → 0.6.4

data/definitions/procedures/content/prepare.rb

@@ -0,0 +1,12 @@
+module Procedures::Content
+  class Prepare < ForemanMaintain::Procedure
+    metadata do
+      description 'Prepare content for Pulp 3'
+      for_feature :pulpcore
+    end
+
+    def run
+      puts execute!('foreman-rake katello:pulp3_migration')
+    end
+  end
+end

data/definitions/procedures/content/switchover.rb

@@ -0,0 +1,22 @@
+module Procedures::Content
+  class Switchover < ForemanMaintain::Procedure
+    metadata do
+      description 'Switch support for certain content from Pulp 2 to Pulp 3'
+      for_feature :pulpcore
+    end
+
+    def run
+      puts 'Performing final content migration before switching content'
+      puts execute!('foreman-rake katello:pulp3_migration')
+      puts 'Performing a check to verify everything that is needed has been migrated'
+      puts execute!('foreman-rake katello:pulp3_post_migration_check')
+      puts 'Switching specified content over to pulp 3'
+      puts execute!('foreman-rake katello:pulp3_content_switchover')
+      puts 'Re-running the installer to switch specified content over to pulp3'
+      args = ['--foreman-proxy-content-proxy-pulp-isos-to-pulpcore=true',
+              '--katello-use-pulp-2-for-file=false',
+              '--katello-use-pulp-2-for-docker=false']
+      feature(:installer).run(args.join(' '))
+    end
+  end
+end

data/definitions/procedures/hammer_setup.rb

@@ -5,7 +5,7 @@ class Procedures::HammerSetup < ForemanMaintain::Procedure
   end
 
   def run
-    if feature(:foreman_server) && ForemanMaintain::Utils.system_service('httpd', 30).running?
+    if feature(:foreman_server) && 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/installer/run.rb

@@ -2,10 +2,12 @@ module Procedures::Installer
   class Run < ForemanMaintain::Procedure
     metadata do
       param :arguments, 'Arguments passed to installer'
+      param :assumeyes, 'Do not ask for confirmation'
     end
 
     def run
-      feature(:installer).run(@arguments, :interactive => true)
+      assumeyes_val = @assumeyes.nil? ? assumeyes? : @assumeyes
+      feature(:installer).run(@arguments, :interactive => !assumeyes_val)
     end
 
     def description

data/definitions/procedures/installer/upgrade.rb

@@ -1,7 +1,12 @@
 module Procedures::Installer
   class Upgrade < ForemanMaintain::Procedure
+    metadata do
+      param :assumeyes, 'Do not ask for confirmation'
+    end
+
     def run
-      feature(:installer).upgrade(:interactive => true)
+      assumeyes_val = @assumeyes.nil? ? assumeyes? : @assumeyes
+      feature(:installer).run(@arguments, :interactive => !assumeyes_val)
     end
   end
 end

data/definitions/procedures/packages/update.rb

@@ -10,7 +10,7 @@ module Procedures::Packages
 
     def run
       assumeyes_val = @assumeyes.nil? ? assumeyes? : @assumeyes
-      package_manager.clean_cache
+      package_manager.clean_cache(:assumeyes => assumeyes_val)
       packages_action(:update, @packages, :assumeyes => assumeyes_val)
     rescue ForemanMaintain::Error::ExecutionError => e
       if @warn_on_errors

data/definitions/procedures/pulp/migrate.rb

@@ -4,7 +4,7 @@ module Procedures::Pulp
 
     metadata do
       description 'Migrate pulp db'
-      for_feature :pulp
+      for_feature :pulp2
     end
 
     def run

data/definitions/procedures/pulpcore/migrate.rb

@@ -0,0 +1,25 @@
+module Procedures::Pulpcore
+  class Migrate < ForemanMaintain::Procedure
+    include ForemanMaintain::Concerns::SystemService
+
+    metadata do
+      description 'Migrate pulpcore db'
+      for_feature :pulpcore
+    end
+
+    def run
+      with_spinner('Migrating pulpcore') do |spinner|
+        necessary_services = feature(:pulpcore_database).services
+        pulp_services = feature(:pulpcore).services
+
+        feature(:service).handle_services(spinner, 'start', :only => necessary_services)
+        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 '\
+          'python3-django-admin migrate --noinput')
+      end
+    end
+  end
+end

data/definitions/procedures/restore/configs.rb

@@ -14,6 +14,7 @@ module Procedures::Restore
         spinner.update('Restoring configs')
         clean_conflicting_data
         restore_configs(backup)
+        reset_qpid_jrnls
         reload_configs
       end
     end
@@ -45,5 +46,11 @@ module Procedures::Restore
       # tar is unable to --overwrite dir with symlink
       execute('rm -rf /usr/share/foreman-proxy/.ssh')
     end
+
+    def reset_qpid_jrnls
+      # on restore without pulp data qpid fails to start
+      # https://access.redhat.com/solutions/4645231
+      execute('rm -rf /var/lib/qpidd/.qpidd/qls/dat2/__db.00*')
+    end
   end
 end

data/definitions/procedures/restore/drop_databases.rb

@@ -8,7 +8,7 @@ module Procedures::Restore
             :required => true
 
       confine do
-        feature(:foreman_database) || feature(:candlepin_database)
+        feature(:foreman_database) || feature(:candlepin_database) || feature(:pulpcore_database)
       end
     end
 
@@ -19,6 +19,9 @@ module Procedures::Restore
         feature(:service).handle_services(spinner, 'start', :only => ['postgresql'])
         drop_foreman(backup, spinner)
         drop_candlepin(backup, spinner)
+        if feature(:pulpcore)
+          drop_pulpcore(backup, spinner)
+        end
       end
     end
 
@@ -35,5 +38,12 @@ module Procedures::Restore
         feature(:candlepin_database).dropdb
       end
     end
+
+    def drop_pulpcore(backup, spinner)
+      if backup.file_map[:pulpcore_dump][:present]
+        spinner.update('Dropping pulpcore database')
+        feature(:pulpcore_database).dropdb
+      end
+    end
   end
 end

data/definitions/procedures/restore/mongo_dump.rb

@@ -2,7 +2,7 @@ module Procedures::Restore
   class MongoDump < ForemanMaintain::Procedure
     metadata do
       description 'Restore mongo dump'
-      for_feature :pulp
+      for_feature :pulp2
       param :backup_dir,
             'Path to backup directory',
             :required => true
@@ -10,7 +10,7 @@ module Procedures::Restore
         [Checks::Mongo::DBUp.new, Checks::Mongo::ToolsInstalled.new]
       end
       confine do
-        feature(:mongo) && feature(:pulp)
+        feature(:mongo) && feature(:pulp2)
       end
     end
 

data/definitions/procedures/restore/pulpcore_dump.rb

@@ -0,0 +1,30 @@
+module Procedures::Restore
+  class PulpcoreDump < ForemanMaintain::Procedure
+    metadata do
+      description 'Restore pulpcore postgresql dump from backup'
+      param :backup_dir,
+            'Path to backup directory',
+            :required => true
+      preparation_steps { Checks::Pulpcore::DBUp.new }
+      confine do
+        feature(:pulpcore_database)
+      end
+    end
+
+    def run
+      backup = ForemanMaintain::Utils::Backup.new(@backup_dir)
+
+      with_spinner('Restoring pulpcore postgresql dump') do |spinner|
+        restore_pulpcore_dump(backup, spinner)
+      end
+    end
+
+    def restore_pulpcore_dump(backup, spinner)
+      if backup.file_map[:pulpcore_dump][:present]
+        spinner.update('Restoring pulpcore dump')
+        local = feature(:pulpcore_database).local?
+        feature(:pulpcore_database).restore_dump(backup.file_map[:pulpcore_dump][:path], local)
+      end
+    end
+  end
+end

data/definitions/procedures/service/base.rb

@@ -15,7 +15,7 @@ module Procedures
 
       def run_service_action(action, options)
         action_noun = feature(:service).action_noun(action).capitalize
-        puts "#{action_noun} the following service(s):\n"
+        puts "\n#{action_noun} the following service(s):"
         services = feature(:service).filtered_services(options)
         print_services(services)
 

data/definitions/procedures/service/stop.rb

@@ -8,7 +8,7 @@ module Procedures::Service
     end
 
     def run
-      run_service_action('stop', common_options)
+      run_service_action('stop', common_options.merge(:include_sockets => true))
     end
   end
 end

data/definitions/scenarios/backup.rb

@@ -51,12 +51,15 @@ module ForemanMaintain::Scenarios
                   Procedures::Backup::Online::PgGlobalObjects => :backup_dir,
                   Procedures::Backup::Online::CandlepinDB => :backup_dir,
                   Procedures::Backup::Online::ForemanDB => :backup_dir,
+                  Procedures::Backup::Online::PulpcoreDB => :backup_dir,
                   Procedures::Backup::Offline::CandlepinDB => :backup_dir,
                   Procedures::Backup::Offline::ForemanDB => :backup_dir,
+                  Procedures::Backup::Offline::PulpcoreDB => :backup_dir,
                   Procedures::Backup::Offline::Mongo => :backup_dir,
                   Procedures::Backup::Snapshot::LogicalVolumeConfirmation => :backup_dir,
                   Procedures::Backup::Snapshot::MountCandlepinDB => :backup_dir,
                   Procedures::Backup::Snapshot::MountForemanDB => :backup_dir,
+                  Procedures::Backup::Snapshot::MountPulpcoreDB => :backup_dir,
                   Procedures::Backup::Snapshot::MountMongo => :backup_dir)
       context.map(:preserve_dir,
                   Checks::Backup::DirectoryReady => :preserve_dir,
@@ -73,15 +76,18 @@ module ForemanMaintain::Scenarios
                   Procedures::Backup::Snapshot::CleanMount => :mount_dir,
                   Procedures::Backup::Snapshot::MountCandlepinDB => :mount_dir,
                   Procedures::Backup::Snapshot::MountForemanDB => :mount_dir,
+                  Procedures::Backup::Snapshot::MountPulpcoreDB => :mount_dir,
                   Procedures::Backup::Offline::Mongo => :mount_dir,
                   Procedures::Backup::Pulp => :mount_dir,
                   Procedures::Backup::Offline::CandlepinDB => :mount_dir,
-                  Procedures::Backup::Offline::ForemanDB => :mount_dir)
+                  Procedures::Backup::Offline::ForemanDB => :mount_dir,
+                  Procedures::Backup::Offline::PulpcoreDB => :mount_dir)
       context.map(:snapshot_block_size,
                   Procedures::Backup::Snapshot::MountMongo => :block_size,
                   Procedures::Backup::Snapshot::MountPulp => :block_size,
                   Procedures::Backup::Snapshot::MountForemanDB => :block_size,
-                  Procedures::Backup::Snapshot::MountCandlepinDB => :block_size)
+                  Procedures::Backup::Snapshot::MountCandlepinDB => :block_size,
+                  Procedures::Backup::Snapshot::MountPulpcoreDB => :block_size)
       context.map(:skip_pulp_content,
                   Procedures::Backup::Pulp => :skip,
                   Procedures::Backup::Snapshot::LogicalVolumeConfirmation => :skip_pulp,
@@ -135,6 +141,7 @@ module ForemanMaintain::Scenarios
         Procedures::Backup::Offline::Mongo,
         Procedures::Backup::Offline::CandlepinDB,
         Procedures::Backup::Offline::ForemanDB,
+        Procedures::Backup::Offline::PulpcoreDB,
         Procedures::Service::Start,
         find_procedures(:maintenance_mode_off)
       )
@@ -150,6 +157,9 @@ module ForemanMaintain::Scenarios
       if feature(:instance).database_local?(:foreman_database)
         add_step_with_context(Procedures::Backup::Online::ForemanDB)
       end
+      if feature(:instance).database_local?(:pulpcore_database)
+        add_step_with_context(Procedures::Backup::Online::PulpcoreDB)
+      end
       if feature(:instance).database_local?(:mongo)
         add_step_with_context(Procedures::Backup::Online::Mongo)
       end
@@ -168,6 +178,7 @@ module ForemanMaintain::Scenarios
         Procedures::Backup::Snapshot::MountPulp,
         Procedures::Backup::Snapshot::MountCandlepinDB,
         Procedures::Backup::Snapshot::MountForemanDB,
+        Procedures::Backup::Snapshot::MountPulpcoreDB,
         Procedures::Service::Start,
         find_procedures(:maintenance_mode_off),
         Procedures::Backup::Pulp
@@ -178,6 +189,9 @@ module ForemanMaintain::Scenarios
       if feature(:instance).database_local?(:foreman_database)
         add_step_with_context(Procedures::Backup::Offline::ForemanDB)
       end
+      if feature(:instance).database_local?(:pulpcore_database)
+        add_step_with_context(Procedures::Backup::Offline::PulpcoreDB)
+      end
       if feature(:instance).database_local?(:mongo)
         add_step_with_context(Procedures::Backup::Offline::Mongo)
       end
@@ -193,7 +207,8 @@ module ForemanMaintain::Scenarios
         Procedures::Backup::Online::Mongo,
         Procedures::Backup::Online::PgGlobalObjects,
         Procedures::Backup::Online::CandlepinDB,
-        Procedures::Backup::Online::ForemanDB
+        Procedures::Backup::Online::ForemanDB,
+        Procedures::Backup::Online::PulpcoreDB
       )
     end
 

data/definitions/scenarios/content.rb

@@ -0,0 +1,27 @@
+module ForemanMaintain::Scenarios
+  module Content
+    class Prepare < ForemanMaintain::Scenario
+      metadata do
+        label :content_prepare
+        description 'Prepare content for Pulp 3'
+        manual_detection
+      end
+
+      def compose
+        add_step(Procedures::Content::Prepare)
+      end
+    end
+
+    class Switchover < ForemanMaintain::Scenario
+      metadata do
+        label :content_switchover
+        description 'Switch support for certain content from Pulp 2 to Pulp 3'
+        manual_detection
+      end
+
+      def compose
+        add_step(Procedures::Content::Switchover)
+      end
+    end
+  end
+end

data/definitions/scenarios/packages.rb

@@ -1,5 +1,16 @@
 module ForemanMaintain::Scenarios
   module Packages
+    def self.skip_installer_run?(packages_list)
+      packages_list = packages_list.split(',').map(&:strip) if packages_list.is_a?(String)
+
+      return false unless packages_list.any? { |p| p.include?('foreman_maintain') }
+      return true if packages_list.length == 1
+
+      fm_pkg = ForemanMaintain.main_package_name
+      puts "ERROR: install or update '#{fm_pkg}' package individually."
+      exit 1
+    end
+
     class Status < ForemanMaintain::Scenario
       metadata do
         label :packages_status
@@ -45,13 +56,17 @@ module ForemanMaintain::Scenarios
       end
 
       def compose
-        add_step_with_context(Procedures::Packages::InstallerConfirmation)
-        add_step_with_context(Procedures::Packages::UnlockVersions)
-        add_step_with_context(Procedures::Packages::Install,
-                              :force => true, :warn_on_errors => true)
-        add_step_with_context(Procedures::Installer::Run,
-                              :arguments => '--upgrade --disable-system-checks')
-        add_step(Procedures::Packages::LockingStatus)
+        if Packages.skip_installer_run?(context.get(:packages))
+          add_step_with_context(Procedures::Packages::Install,
+                                :force => true, :warn_on_errors => true)
+        else
+          add_step_with_context(Procedures::Packages::InstallerConfirmation)
+          add_step_with_context(Procedures::Packages::UnlockVersions)
+          add_step_with_context(Procedures::Packages::Install,
+                                :force => true, :warn_on_errors => true)
+          add_step_with_context(Procedures::Installer::Upgrade)
+          add_step(Procedures::Packages::LockingStatus)
+        end
       end
 
       def set_context_mapping
@@ -71,15 +86,20 @@ module ForemanMaintain::Scenarios
       end
 
       def compose
-        add_steps_with_context(
-          Procedures::Packages::UpdateAllConfirmation,
-          Procedures::Packages::InstallerConfirmation,
-          Procedures::Packages::UnlockVersions
-        )
-        add_step_with_context(Procedures::Packages::Update, :force => true, :warn_on_errors => true)
-        add_step_with_context(Procedures::Installer::Run,
-                              :arguments => '--upgrade --disable-system-checks')
-        add_step(Procedures::Packages::LockingStatus)
+        if Packages.skip_installer_run?(context.get(:packages))
+          add_step_with_context(Procedures::Packages::Update,
+                                :force => true, :warn_on_errors => true)
+        else
+          add_steps_with_context(
+            Procedures::Packages::UpdateAllConfirmation,
+            Procedures::Packages::InstallerConfirmation,
+            Procedures::Packages::UnlockVersions
+          )
+          add_step_with_context(Procedures::Packages::Update,
+                                :force => true, :warn_on_errors => true)
+          add_step_with_context(Procedures::Installer::Upgrade)
+          add_step(Procedures::Packages::LockingStatus)
+        end
       end
 
       def set_context_mapping

data/definitions/scenarios/restore.rb

@@ -36,6 +36,7 @@ module ForemanMaintain::Scenarios
       end
       restore_mongo_dump(backup)
       add_steps_with_context(Procedures::Pulp::Migrate,
+                             Procedures::Pulpcore::Migrate,
                              Procedures::Service::Start,
                              Procedures::Service::DaemonReload)
     end
@@ -43,7 +44,8 @@ module ForemanMaintain::Scenarios
 
     def drop_dbs(backup)
       if backup.file_map[:candlepin_dump][:present] ||
-         backup.file_map[:foreman_dump][:present]
+         backup.file_map[:foreman_dump][:present] ||
+         (feature(:pulpcore) && backup.file_map[:pulpcore_dump][:present])
         add_steps_with_context(Procedures::Restore::DropDatabases)
       end
     end
@@ -58,6 +60,9 @@ module ForemanMaintain::Scenarios
       if backup.file_map[:foreman_dump][:present]
         add_steps_with_context(Procedures::Restore::ForemanDump)
       end
+      if feature(:pulpcore) && backup.file_map[:pulpcore_dump][:present]
+        add_steps_with_context(Procedures::Restore::PulpcoreDump)
+      end
     end
 
     def restore_mongo_dump(backup)
@@ -83,6 +88,7 @@ module ForemanMaintain::Scenarios
                   Procedures::Restore::PgGlobalObjects => :backup_dir,
                   Procedures::Restore::CandlepinDump => :backup_dir,
                   Procedures::Restore::ForemanDump => :backup_dir,
+                  Procedures::Restore::PulpcoreDump => :backup_dir,
                   Procedures::Restore::ExtractFiles => :backup_dir,
                   Procedures::Restore::MongoDump => :backup_dir)