Fixes #29282 - Enable Puma migration on compatible upgrades

The commit bd02fbd reverted commit 0b244f5. theforeman/puppet-foreman#814 fixed the race condition of systemctl start foreman returning immediately before the service was up.
sthirugn · Apr 1, 2020 · f8a127c · f8a127c
1 parent a3a0fe6
commit f8a127c
Show file tree

Hide file tree

Showing 2 changed files with 12 additions and 0 deletions.
diff --git a/config/foreman.migrations/20200305172758_enable_puma.rb b/config/foreman.migrations/20200305172758_enable_puma.rb
@@ -0,0 +1,6 @@
+if answers['foreman'].is_a?(Hash)
+    mod_answers = answers['foreman']
+    if mod_answers['passenger'] && !(mod_answers['ipa_authentication'] || mod_answers['keycloak'])
+      answers['foreman']['passenger'] = false
+    end
+end
diff --git a/config/katello.migrations/200306192827-enable_puma.rb b/config/katello.migrations/200306192827-enable_puma.rb
@@ -0,0 +1,6 @@
+if answers['foreman'].is_a?(Hash)
+    mod_answers = answers['foreman']
+    if mod_answers['passenger'] && !(mod_answers['ipa_authentication'] || mod_answers['keycloak'])
+      answers['foreman']['passenger'] = false
+    end
+end