Skip to content

Commit 638ed5a

Browse files
committed
Fixes #35029 - Require Candlepin CA cert prior running installer
(cherry picked from commit d709642)
1 parent 5195c15 commit 638ed5a

File tree

2 files changed

+53
-1
lines changed

2 files changed

+53
-1
lines changed
Lines changed: 52 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,52 @@
1+
module Procedures::Installer
2+
class RunFor6_11 < ForemanMaintain::Procedure
3+
metadata do
4+
description 'Run installer with Candlepin SSL CA'\
5+
' when using external database with SSL'
6+
param :assumeyes, 'Do not ask for confirmation'
7+
manual_detection
8+
end
9+
10+
def run
11+
if extdb_and_ssl?
12+
run_installer_with_extra_option
13+
else
14+
run_installer
15+
end
16+
end
17+
18+
def ext_db?
19+
!feature(:foreman_database).local?
20+
end
21+
22+
def installer_answers
23+
@installer_answers ||= feature(:installer).answers
24+
end
25+
26+
def server_db_with_ssl?
27+
installer_answers.fetch('katello')['candlepin_db_ssl']
28+
end
29+
30+
def extdb_and_ssl?
31+
ext_db? && server_db_with_ssl?
32+
end
33+
34+
def run_installer_with_extra_option
35+
ssl_ca_path = installer_answers.fetch('foreman')['db_root_cert']
36+
spinner_msg = "Running installer with --katello-candlepin-db-ssl-ca #{ssl_ca_path} argument!"
37+
with_spinner(spinner_msg) do
38+
installer_args = feature(:installer).installer_arguments
39+
new_ssl_arg = " --katello-candlepin-db-ssl-ca #{ssl_ca_path}"
40+
installer_args << new_ssl_arg
41+
feature(:installer).run(installer_args)
42+
end
43+
end
44+
45+
def run_installer
46+
with_spinner('Executing installer') do
47+
assumeyes_val = @assumeyes.nil? ? assumeyes? : @assumeyes
48+
feature(:installer).upgrade(:interactive => !assumeyes_val)
49+
end
50+
end
51+
end
52+
end

definitions/scenarios/upgrade_to_satellite_6_11.rb

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -61,7 +61,7 @@ def compose
6161
add_step(Procedures::Repositories::Setup.new(:version => '6.11'))
6262
add_step(Procedures::Packages::UnlockVersions.new)
6363
add_step(Procedures::Packages::Update.new(:assumeyes => true))
64-
add_step_with_context(Procedures::Installer::Upgrade)
64+
add_step_with_context(Procedures::Installer::RunFor6_11)
6565
add_step(Procedures::Installer::UpgradeRakeTask)
6666
end
6767
end

0 commit comments

Comments
 (0)