Fixes #33281 - run installer with upgrade flags after restore

(cherry picked from commit 6089aa6)
theforeman · Apr 19, 2022 · 9d30300 · 9d30300
1 parent 67ceb32
commit 9d30300
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 1 deletion.
diff --git a/definitions/procedures/installer/upgrade_rake_task.rb b/definitions/procedures/installer/upgrade_rake_task.rb
@@ -5,7 +5,9 @@ class UpgradeRakeTask < ForemanMaintain::Procedure
     end
 
     def run
-      execute!('foreman-rake upgrade:run')
+      # only run this in the Satellite scenario, as in others
+      # the installer runs this rake task for us already
+      execute!('foreman-rake upgrade:run') if feature(:satellite)
     end
   end
 end
diff --git a/definitions/scenarios/restore.rb b/definitions/scenarios/restore.rb
@@ -42,6 +42,8 @@ def compose
       add_steps_with_context(Procedures::Restore::RegenerateQueues) if backup.online_backup?
       add_steps_with_context(Procedures::Service::Start,
                              Procedures::Service::DaemonReload)
+      add_step(Procedures::Installer::Upgrade.new(:assumeyes => true))
+      add_step_with_context(Procedures::Installer::UpgradeRakeTask)
       add_step_with_context(Procedures::Crond::Start) if feature(:cron)
     end
     # rubocop:enable Metrics/MethodLength,Metrics/AbcSize