foreman_maintain 0.6.2 → 0.6.7

data/definitions/scenarios/upgrade_to_satellite_6_6_z.rb

@@ -2,13 +2,19 @@ module Scenarios::Satellite_6_6_z
   class Abstract < ForemanMaintain::Scenario
     def self.upgrade_metadata(&block)
       metadata do
-        tags :upgrade_to_satellite_6_6_z
+        tags :upgrade_scenario
         confine do
-          feature(:satellite) && feature(:satellite).current_minor_version == '6.6'
+          feature(:satellite) &&
+            (feature(:satellite).current_minor_version == '6.6' || \
+            ForemanMaintain.upgrade_in_progress == '6.6.z')
         end
         instance_eval(&block)
       end
     end
+
+    def target_version
+      '6.6.z'
+    end
   end
 
   class PreUpgradeCheck < Abstract
@@ -43,11 +49,15 @@ module Scenarios::Satellite_6_6_z
       tags :migrations
     end
 
+    def set_context_mapping
+      context.map(:assumeyes, Procedures::Installer::Upgrade => :assumeyes)
+    end
+
     def compose
       add_step(Procedures::Repositories::Setup.new(:version => '6.6'))
       add_step(Procedures::Packages::UnlockVersions.new)
       add_step(Procedures::Packages::Update.new(:assumeyes => true))
-      add_step(Procedures::Installer::Upgrade.new)
+      add_step_with_context(Procedures::Installer::Upgrade)
     end
   end
 
@@ -78,5 +88,3 @@ module Scenarios::Satellite_6_6_z
     end
   end
 end
-
-ForemanMaintain::UpgradeRunner.register_version('6.6.z', :upgrade_to_satellite_6_6_z)

data/definitions/scenarios/upgrade_to_satellite_6_7.rb

@@ -2,13 +2,19 @@ module Scenarios::Satellite_6_7
   class Abstract < ForemanMaintain::Scenario
     def self.upgrade_metadata(&block)
       metadata do
-        tags :upgrade_to_satellite_6_7
+        tags :upgrade_scenario
         confine do
-          feature(:satellite) && feature(:satellite).current_minor_version == '6.6'
+          feature(:satellite) &&
+            (feature(:satellite).current_minor_version == '6.6' || \
+            ForemanMaintain.upgrade_in_progress == '6.7')
         end
         instance_eval(&block)
       end
     end
+
+    def target_version
+      '6.7'
+    end
   end
 
   class PreUpgradeCheck < Abstract
@@ -43,11 +49,15 @@ module Scenarios::Satellite_6_7
       tags :migrations
     end
 
+    def set_context_mapping
+      context.map(:assumeyes, Procedures::Installer::Upgrade => :assumeyes)
+    end
+
     def compose
       add_step(Procedures::Repositories::Setup.new(:version => '6.7'))
       add_step(Procedures::Packages::UnlockVersions.new)
       add_step(Procedures::Packages::Update.new(:assumeyes => true))
-      add_step(Procedures::Installer::Upgrade.new)
+      add_step_with_context(Procedures::Installer::Upgrade)
     end
   end
 
@@ -76,5 +86,3 @@ module Scenarios::Satellite_6_7
     end
   end
 end
-
-ForemanMaintain::UpgradeRunner.register_version('6.7', :upgrade_to_satellite_6_7)

data/definitions/scenarios/upgrade_to_satellite_6_7_z.rb

@@ -2,13 +2,19 @@ module Scenarios::Satellite_6_7_z
   class Abstract < ForemanMaintain::Scenario
     def self.upgrade_metadata(&block)
       metadata do
-        tags :upgrade_to_satellite_6_7_z
+        tags :upgrade_scenario
         confine do
-          feature(:satellite) && feature(:satellite).current_minor_version == '6.7'
+          feature(:satellite) &&
+            (feature(:satellite).current_minor_version == '6.7' || \
+            ForemanMaintain.upgrade_in_progress == '6.7.z')
         end
         instance_eval(&block)
       end
     end
+
+    def target_version
+      '6.7.z'
+    end
   end
 
   class PreUpgradeCheck < Abstract
@@ -43,11 +49,15 @@ module Scenarios::Satellite_6_7_z
       tags :migrations
     end
 
+    def set_context_mapping
+      context.map(:assumeyes, Procedures::Installer::Upgrade => :assumeyes)
+    end
+
     def compose
       add_step(Procedures::Repositories::Setup.new(:version => '6.7'))
       add_step(Procedures::Packages::UnlockVersions.new)
       add_step(Procedures::Packages::Update.new(:assumeyes => true))
-      add_step(Procedures::Installer::Upgrade.new)
+      add_step_with_context(Procedures::Installer::Upgrade)
     end
   end
 
@@ -76,5 +86,3 @@ module Scenarios::Satellite_6_7_z
     end
   end
 end
-
-ForemanMaintain::UpgradeRunner.register_version('6.7.z', :upgrade_to_satellite_6_7_z)

data/definitions/scenarios/upgrade_to_satellite_6_8.rb

@@ -0,0 +1,88 @@
+module Scenarios::Satellite_6_8
+  class Abstract < ForemanMaintain::Scenario
+    def self.upgrade_metadata(&block)
+      metadata do
+        tags :upgrade_scenario
+        confine do
+          feature(:satellite) &&
+            (feature(:satellite).current_minor_version == '6.7' || \
+            ForemanMaintain.upgrade_in_progress == '6.8')
+        end
+        instance_eval(&block)
+      end
+    end
+
+    def target_version
+      '6.8'
+    end
+  end
+
+  class PreUpgradeCheck < Abstract
+    upgrade_metadata do
+      description 'Checks before upgrading to Satellite 6.8'
+      tags :pre_upgrade_checks
+      run_strategy :fail_slow
+    end
+
+    def compose
+      add_steps(find_checks(:default))
+      add_steps(find_checks(:pre_upgrade))
+      add_step(Checks::Repositories::Validate.new(:version => '6.8'))
+    end
+  end
+
+  class PreMigrations < Abstract
+    upgrade_metadata do
+      description 'Procedures before migrating to Satellite 6.8'
+      tags :pre_migrations
+    end
+
+    def compose
+      add_steps(find_procedures(:pre_migrations))
+      add_step(Procedures::Service::Stop.new)
+    end
+  end
+
+  class Migrations < Abstract
+    upgrade_metadata do
+      description 'Migration scripts to Satellite 6.8'
+      tags :migrations
+    end
+
+    def set_context_mapping
+      context.map(:assumeyes, Procedures::Installer::Upgrade => :assumeyes)
+    end
+
+    def compose
+      add_step(Procedures::Repositories::Setup.new(:version => '6.8'))
+      add_step(Procedures::Packages::UnlockVersions.new)
+      add_step(Procedures::Packages::Update.new(:assumeyes => true))
+      add_step_with_context(Procedures::Installer::Upgrade)
+    end
+  end
+
+  class PostMigrations < Abstract
+    upgrade_metadata do
+      description 'Procedures after migrating to Satellite 6.8'
+      tags :post_migrations
+    end
+
+    def compose
+      add_step(Procedures::Service::Start.new)
+      add_steps(find_procedures(:post_migrations))
+    end
+  end
+
+  class PostUpgradeChecks < Abstract
+    upgrade_metadata do
+      description 'Checks after upgrading to Satellite 6.8'
+      tags :post_upgrade_checks
+      run_strategy :fail_slow
+    end
+
+    def compose
+      add_steps(find_checks(:default))
+      add_steps(find_checks(:post_upgrade))
+    end
+  end
+end

data/definitions/scenarios/upgrade_to_satellite_6_8_z.rb

@@ -0,0 +1,88 @@
+module Scenarios::Satellite_6_8_z
+  class Abstract < ForemanMaintain::Scenario
+    def self.upgrade_metadata(&block)
+      metadata do
+        tags :upgrade_scenario
+        confine do
+          feature(:satellite) &&
+            (feature(:satellite).current_minor_version == '6.8' || \
+            ForemanMaintain.upgrade_in_progress == '6.8.z')
+        end
+        instance_eval(&block)
+      end
+    end
+
+    def target_version
+      '6.8.z'
+    end
+  end
+
+  class PreUpgradeCheck < Abstract
+    upgrade_metadata do
+      description 'Checks before upgrading to Satellite 6.8.z'
+      tags :pre_upgrade_checks
+      run_strategy :fail_slow
+    end
+
+    def compose
+      add_steps(find_checks(:default))
+      add_steps(find_checks(:pre_upgrade))
+      add_step(Checks::Repositories::Validate.new(:version => '6.8'))
+    end
+  end
+
+  class PreMigrations < Abstract
+    upgrade_metadata do
+      description 'Procedures before migrating to Satellite 6.8.z'
+      tags :pre_migrations
+    end
+
+    def compose
+      add_steps(find_procedures(:pre_migrations))
+      add_step(Procedures::Service::Stop.new)
+    end
+  end
+
+  class Migrations < Abstract
+    upgrade_metadata do
+      description 'Migration scripts to Satellite 6.8.z'
+      tags :migrations
+    end
+
+    def set_context_mapping
+      context.map(:assumeyes, Procedures::Installer::Upgrade => :assumeyes)
+    end
+
+    def compose
+      add_step(Procedures::Repositories::Setup.new(:version => '6.8'))
+      add_step(Procedures::Packages::UnlockVersions.new)
+      add_step(Procedures::Packages::Update.new(:assumeyes => true))
+      add_step_with_context(Procedures::Installer::Upgrade)
+    end
+  end
+
+  class PostMigrations < Abstract
+    upgrade_metadata do
+      description 'Procedures after migrating to Satellite 6.8.z'
+      tags :post_migrations
+    end
+
+    def compose
+      add_step(Procedures::Service::Start.new)
+      add_steps(find_procedures(:post_migrations))
+    end
+  end
+
+  class PostUpgradeChecks < Abstract
+    upgrade_metadata do
+      description 'Checks after upgrading to Satellite 6.8.z'
+      tags :post_upgrade_checks
+      run_strategy :fail_slow
+    end
+
+    def compose
+      add_steps(find_checks(:default))
+      add_steps(find_checks(:post_upgrade))
+    end
+  end
+end

data/lib/foreman_maintain.rb

@@ -139,5 +139,36 @@ module ForemanMaintain
     rescue StandardError => e
       logger.error "Invalid Storage label i.e #{label}. Error - #{e.message}"
     end
+
+    def upgrade_in_progress
+      storage[:upgrade_target_version]
+    end
+
+    def pkg_and_cmd_name
+      instance_feature = ForemanMaintain.available_features(:label => :instance).first
+      if instance_feature.downstream
+        return %w[satellite-maintain satellite-maintain]
+      end
+
+      [main_package_name, 'foreman-maintain']
+    end
+
+    def perform_self_upgrade
+      package_name, command = pkg_and_cmd_name
+
+      puts "Checking for new version of #{package_name}..."
+      if ForemanMaintain.package_manager.update_available?(main_package_name)
+        puts "\nUpdating #{package_name} package."
+        ForemanMaintain.package_manager.update(main_package_name, :assumeyes => true)
+        puts "\nThe #{package_name} package successfully updated."\
+             "\nRe-run #{command} with required options!"
+        exit 0
+      end
+      puts "Nothing to update, can't find new version of #{package_name}."
+    end
+
+    def main_package_name
+      'rubygem-foreman_maintain'
+    end
   end
 end

data/lib/foreman_maintain/cli.rb

@@ -10,6 +10,7 @@ require 'foreman_maintain/cli/service_command'
 require 'foreman_maintain/cli/restore_command'
 require 'foreman_maintain/cli/maintenance_mode_command'
 require 'foreman_maintain/cli/packages_command'
+require 'foreman_maintain/cli/content_command'
 
 module ForemanMaintain
   module Cli
@@ -23,6 +24,7 @@ module ForemanMaintain
       subcommand 'restore', 'Restore a backup', RestoreCommand
       subcommand 'packages', 'Lock/Unlock package protection, install, update', PackagesCommand
       subcommand 'advanced', 'Advanced tools for server maintenance', AdvancedCommand
+      subcommand 'content', 'Content related commands', ContentCommand
       subcommand 'maintenance-mode', 'Control maintenance-mode for application',
                  MaintenanceModeCommand
 

data/lib/foreman_maintain/cli/content_command.rb

@@ -0,0 +1,17 @@
+module ForemanMaintain
+  module Cli
+    class ContentCommand < Base
+      subcommand 'prepare', 'Prepare content for Pulp 3' do
+        def execute
+          run_scenarios_and_exit(Scenarios::Content::Prepare.new)
+        end
+      end
+
+      subcommand 'switchover', 'Switch support for certain content from Pulp 2 to Pulp 3' do
+        def execute
+          run_scenarios_and_exit(Scenarios::Content::Switchover.new)
+        end
+      end
+    end
+  end
+end

data/lib/foreman_maintain/cli/restore_command.rb

@@ -13,7 +13,8 @@ module ForemanMaintain
           :backup_dir => @backup_dir,
           :incremental_backup => @incremental || incremental_backup?
         )
-        run_scenario(scenario)
+        rescue_scenario = Scenarios::RestoreRescue.new
+        run_scenario(scenario, rescue_scenario)
         exit runner.exit_code
       end
 

data/lib/foreman_maintain/cli/upgrade_command.rb

@@ -6,6 +6,11 @@ module ForemanMaintain
                :required => false
       end
 
+      def self.disable_self_upgrade_option
+        option '--disable-self-upgrade', :flag, 'Disable automatic self upgrade',
+               :default => false
+      end
+
       def current_target_version
         current_target_version = ForemanMaintain::UpgradeRunner.current_target_version
         if current_target_version && target_version && target_version != current_target_version
@@ -56,8 +61,10 @@ module ForemanMaintain
       subcommand 'check', 'Run pre-upgrade checks before upgrading to specified version' do
         target_version_option
         interactive_option
+        disable_self_upgrade_option
 
         def execute
+          ForemanMaintain.perform_self_upgrade unless disable_self_upgrade?
           upgrade_runner.run_phase(:pre_upgrade_checks)
           exit upgrade_runner.exit_code
         end
@@ -66,6 +73,8 @@ module ForemanMaintain
       subcommand 'run', 'Run full upgrade to a specified version' do
         target_version_option
         interactive_option
+        disable_self_upgrade_option
+
         option '--phase', 'phase', 'run only a specific phase', :required => false do |phase|
           unless UpgradeRunner::PHASES.include?(phase.to_sym)
             raise Error::UsageError, "Unknown phase #{phase}"
@@ -74,6 +83,7 @@ module ForemanMaintain
         end
 
         def execute
+          ForemanMaintain.perform_self_upgrade unless disable_self_upgrade?
           if phase
             upgrade_runner.run_phase(phase.to_sym)
           else

data/lib/foreman_maintain/concerns/base_database.rb

@@ -150,6 +150,17 @@ module ForemanMaintain
         end
       end
 
+      def db_version(config = configuration)
+        if ping(config)
+          # Note - t removes headers, -A removes alignment whitespace
+          server_version_cmd = psql_command(config) + ' -c "SHOW server_version" -t -A'
+          version_string = execute!(server_version_cmd, :hidden_patterns => [config['password']])
+          version(version_string)
+        else
+          raise_service_error
+        end
+      end
+
       private
 
       def base_command(config, command = 'psql')