foreman_maintain 1.0.11 → 1.0.12

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 27d440b036591f10b20bfde591adfe573d8d48602c40a76791e9fe5fde2eb0a6
-  data.tar.gz: ed71b8df8d073dc8c0607a8b2fdb95926a659033ce5f97b6e01d24a3f1d0916d
+  metadata.gz: 40bec791581fb8e2670586e331afd5e89ba1ca436b38d95e848837fc8ce1fdd3
+  data.tar.gz: 54f35bb8139e221173ca57786c93e36559957116577907fa936d0ff3f4256858
 SHA512:
-  metadata.gz: 0e5b7682a945427963ce4931e2980e49b29633e53f6f3d6172e482a6eb6fe11c84b5f600f00195e6bfd66ba083e359ee811ab75196ffc9af6e096d36f52d0b7d
-  data.tar.gz: 3d4f6b27203254baeafb5f077569b4062c8ab96ee383595f3dd3dbc6acdb0849a68103a959e4306c3e05986c9cf9a3cc5b134726067bdb12e4c02553025f0978
+  metadata.gz: 2e00f5941e44f62e5fa09d47924fa231af050cf32ae555a775bdb247753c0b38d1a2b3c554e86d3699287f1a4367a461f780be6fca5c897031feffbf07de9f53
+  data.tar.gz: 80447d1b43a06edcdd7d9846637c4f484f8bd454e9bdda303355223f64671fa276e37e1c0c8bf50aff1c6213ed30d23028c850b31e1e9f3463b1660994109902

data/definitions/procedures/installer/run_for_6_11.rb

@@ -0,0 +1,52 @@
+module Procedures::Installer
+  class RunFor6_11 < ForemanMaintain::Procedure
+    metadata do
+      description 'Run installer with Candlepin SSL CA'\
+                  ' when using external database with SSL'
+      param :assumeyes, 'Do not ask for confirmation'
+      manual_detection
+    end
+
+    def run
+      if extdb_and_ssl?
+        run_installer_with_extra_option
+      else
+        run_installer
+      end
+    end
+
+    def ext_db?
+      !feature(:foreman_database).local?
+    end
+
+    def installer_answers
+      @installer_answers ||= feature(:installer).answers
+    end
+
+    def server_db_with_ssl?
+      installer_answers.fetch('katello')['candlepin_db_ssl']
+    end
+
+    def extdb_and_ssl?
+      ext_db? && server_db_with_ssl?
+    end
+
+    def run_installer_with_extra_option
+      ssl_ca_path = installer_answers.fetch('foreman')['db_root_cert']
+      spinner_msg = "Running installer with --katello-candlepin-db-ssl-ca #{ssl_ca_path} argument!"
+      with_spinner(spinner_msg) do
+        installer_args = feature(:installer).installer_arguments
+        new_ssl_arg = " --katello-candlepin-db-ssl-ca #{ssl_ca_path}"
+        installer_args << new_ssl_arg
+        feature(:installer).run(installer_args)
+      end
+    end
+
+    def run_installer
+      with_spinner('Executing installer') do
+        assumeyes_val = @assumeyes.nil? ? assumeyes? : @assumeyes
+        feature(:installer).upgrade(:interactive => !assumeyes_val)
+      end
+    end
+  end
+end

data/definitions/scenarios/puppet.rb

@@ -15,7 +15,9 @@ module ForemanMaintain::Scenarios
           add_step(Procedures::Puppet::RemovePuppet)
           add_step(Procedures::Puppet::RemovePuppetData) if context.get(:remove_data)
           add_step(Procedures::Service::Restart)
-          add_step(Procedures::Foreman::ApipieCache)
+          if server?
+            add_step(Procedures::Foreman::ApipieCache)
+          end
         end
       end
     end

data/definitions/scenarios/upgrade_to_satellite_6_11.rb

@@ -61,7 +61,7 @@ module Scenarios::Satellite_6_11
       add_step(Procedures::Repositories::Setup.new(:version => '6.11'))
       add_step(Procedures::Packages::UnlockVersions.new)
       add_step(Procedures::Packages::Update.new(:assumeyes => true))
-      add_step_with_context(Procedures::Installer::Upgrade)
+      add_step_with_context(Procedures::Installer::RunFor6_11)
       add_step(Procedures::Installer::UpgradeRakeTask)
     end
   end

data/lib/foreman_maintain/version.rb

@@ -1,3 +1,3 @@
 module ForemanMaintain
-  VERSION = '1.0.11'.freeze
+  VERSION = '1.0.12'.freeze
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: foreman_maintain
 version: !ruby/object:Gem::Version
-  version: 1.0.11
+  version: 1.0.12
 platform: ruby
 authors:
 - Ivan Nečas
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2022-06-01 00:00:00.000000000 Z
+date: 2022-06-08 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: clamp
@@ -266,6 +266,7 @@ files:
 - definitions/procedures/foreman_tasks/ui_investigate.rb
 - definitions/procedures/hammer_setup.rb
 - definitions/procedures/installer/run.rb
+- definitions/procedures/installer/run_for_6_11.rb
 - definitions/procedures/installer/upgrade.rb
 - definitions/procedures/installer/upgrade_rake_task.rb
 - definitions/procedures/knowledge_base_article.rb