foreman_maintain 1.6.0 → 1.6.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 86d36d447cf87e6f991443352eb5fb9cfdc2b43b634b382c7564f5b86f7e70d1
-  data.tar.gz: 3811b68a80511a95cb5a67b9c8176f623f840ab500e1986b31cd8eac488378ee
+  metadata.gz: bffec6895a006066de751609395b0f865e1dee34b90d01111d2792af59a6b893
+  data.tar.gz: 9388cc01c5be3b68685e7947676119c5fd648a02c0e73bdafb8f8752f7390c45
 SHA512:
-  metadata.gz: df3b536d2f6b89e478fb0355f4f5fbf7049f4d9195dd11c15c46133d341e1d5bd4fd14aabebd35f2b5dd92d341159e5fd8a15a7ddf7ab1f7f9241b3498fe1fe1
-  data.tar.gz: 0c6f8a11f9955900d30c771866ffbeb49ed6bb6c5432fe3575ecef0069d7b76db0099b6a2e37b01adc600013996a46e12d1ffd72986f882cd09b8d9b4cbc5bae
+  metadata.gz: dcdee36a3f44d9809a65b7105f073ed79c10e60d16d34eb4300c1e4ebb4b32255d297b8d9c3eeca346d6865dd88f0c4a5dd66b297dbcea81f8b6d6c0a42ea039
+  data.tar.gz: 90be6369c664ca1fc46b81040a43599b02ba7c2fd26aed1ce628680d750147a3d982593d7cb8694fa3ea6935440ed8eec5bbcd1d78ce98dd79f5a8e8b7b347ac

data/definitions/procedures/packages/enable_modules.rb

@@ -3,14 +3,14 @@ module Procedures::Packages
     metadata do
       description 'Enable the given stream modules'
       confine do
-        package_manager.instance_of?(ForemanMaintain::PackageManager::Dnf)
+        package_manager.modules_supported?
       end
       param :module_names, 'Module names', :array => true, :required => true
       advanced_run false
     end
 
     def run
-      execute!("dnf module enable #{@module_names.join(' ')} -y")
+      package_manager.enable_module(@module_names.join(' '))
     end
   end
 end

data/definitions/procedures/packages/switch_modules.rb

@@ -0,0 +1,16 @@
+module Procedures::Packages
+  class SwitchModules < ForemanMaintain::Procedure
+    metadata do
+      description 'Switch the given stream modules'
+      confine do
+        package_manager.modules_supported?
+      end
+      param :module_names, 'Module names', :array => true, :required => true
+      advanced_run false
+    end
+
+    def run
+      package_manager.switch_module(@module_names.join(' '))
+    end
+  end
+end

data/definitions/scenarios/upgrade_to_capsule_6_16.rb

@@ -39,16 +39,6 @@ module Scenarios::Capsule_6_16
     end
 
     def compose
-      add_step(Procedures::Repositories::Setup.new(:version => '6.16'))
-      if el8?
-        modules_to_enable = ["satellite-capsule:#{el_short_name}"]
-        add_step(Procedures::Packages::EnableModules.new(:module_names => modules_to_enable))
-      end
-      add_step(Procedures::Packages::Update.new(
-        :assumeyes => true,
-        :dnf_options => ['--downloadonly']
-      ))
-
       add_steps(find_procedures(:pre_migrations))
     end
   end
@@ -64,6 +54,17 @@ module Scenarios::Capsule_6_16
     end
 
     def compose
+      add_step(Procedures::Repositories::Setup.new(:version => '6.16'))
+      if el8?
+        modules_to_switch = ['postgresql:13']
+        add_step(Procedures::Packages::SwitchModules.new(:module_names => modules_to_switch))
+        modules_to_enable = ["satellite-capsule:#{el_short_name}"]
+        add_step(Procedures::Packages::EnableModules.new(:module_names => modules_to_enable))
+      end
+      add_step(Procedures::Packages::Update.new(
+        :assumeyes => true,
+        :dnf_options => ['--downloadonly']
+      ))
       add_step(Procedures::Service::Stop.new)
       add_step(Procedures::Packages::Update.new(:assumeyes => true, :clean_cache => false))
       add_step_with_context(Procedures::Installer::Run)

data/definitions/scenarios/upgrade_to_foreman_nightly.rb

@@ -53,6 +53,8 @@ module Scenarios::Foreman_Nightly
     def compose
       add_step(Procedures::Repositories::Setup.new(:version => 'nightly'))
       if el8?
+        modules_to_switch = ['postgresql:13']
+        add_step(Procedures::Packages::SwitchModules.new(:module_names => modules_to_switch))
         modules_to_enable = ["foreman:#{el_short_name}"]
         add_step(Procedures::Packages::EnableModules.new(:module_names => modules_to_enable))
       end

data/definitions/scenarios/upgrade_to_katello_nightly.rb

@@ -53,6 +53,8 @@ module Scenarios::Katello_Nightly
     def compose
       add_step(Procedures::Repositories::Setup.new(:version => 'nightly'))
       if el8?
+        modules_to_switch = ['postgresql:13']
+        add_step(Procedures::Packages::SwitchModules.new(:module_names => modules_to_switch))
         modules_to_enable = ["katello:#{el_short_name}", "pulpcore:#{el_short_name}"]
         add_step(Procedures::Packages::EnableModules.new(:module_names => modules_to_enable))
       end

data/definitions/scenarios/upgrade_to_satellite_6_16.rb

@@ -39,15 +39,6 @@ module Scenarios::Satellite_6_16
     end
 
     def compose
-      add_step(Procedures::Repositories::Setup.new(:version => '6.16'))
-      if el8?
-        modules_to_enable = ["satellite:#{el_short_name}"]
-        add_step(Procedures::Packages::EnableModules.new(:module_names => modules_to_enable))
-      end
-      add_step(Procedures::Packages::Update.new(
-        :assumeyes => true,
-        :dnf_options => ['--downloadonly']
-      ))
       add_steps(find_procedures(:pre_migrations))
     end
   end
@@ -64,6 +55,17 @@ module Scenarios::Satellite_6_16
     end
 
     def compose
+      add_step(Procedures::Repositories::Setup.new(:version => '6.16'))
+      if el8?
+        modules_to_switch = ['postgresql:13']
+        add_step(Procedures::Packages::SwitchModules.new(:module_names => modules_to_switch))
+        modules_to_enable = ["satellite:#{el_short_name}"]
+        add_step(Procedures::Packages::EnableModules.new(:module_names => modules_to_enable))
+      end
+      add_step(Procedures::Packages::Update.new(
+        :assumeyes => true,
+        :dnf_options => ['--downloadonly']
+      ))
       add_step(Procedures::Service::Stop.new)
       add_step(Procedures::Packages::Update.new(:assumeyes => true, :clean_cache => false))
       add_step_with_context(Procedures::Installer::Run)

data/lib/foreman_maintain/package_manager/base.rb

@@ -55,6 +55,11 @@ module ForemanMaintain::PackageManager
       raise NotImplementedError
     end
 
+    # confirms that Package Manager supports modules
+    def modules_supported?
+      false
+    end
+
     private
 
     def sys

data/lib/foreman_maintain/package_manager/dnf.rb

@@ -95,6 +95,10 @@ module ForemanMaintain::PackageManager
       dnf_action('clean', 'metadata', :assumeyes => assumeyes)
     end
 
+    def modules_supported?
+      true
+    end
+
     def module_enabled?(name)
       _status, result = info(name)
       result.match?(/Stream.+\[e\].+/)
@@ -104,6 +108,10 @@ module ForemanMaintain::PackageManager
       dnf_action('module enable', name, assumeyes: true)
     end
 
+    def switch_module(name)
+      dnf_action('module switch-to', name, assumeyes: true)
+    end
+
     def module_exists?(name)
       status, _result = info(name)
       status == 0

data/lib/foreman_maintain/version.rb

@@ -1,3 +1,3 @@
 module ForemanMaintain
-  VERSION = '1.6.0'.freeze
+  VERSION = '1.6.2'.freeze
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: foreman_maintain
 version: !ruby/object:Gem::Version
-  version: 1.6.0
+  version: 1.6.2
 platform: ruby
 authors:
 - Ivan Nečas
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2024-03-13 00:00:00.000000000 Z
+date: 2024-03-29 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: clamp
@@ -268,6 +268,7 @@ files:
 - definitions/procedures/packages/installer_confirmation.rb
 - definitions/procedures/packages/lock_versions.rb
 - definitions/procedures/packages/locking_status.rb
+- definitions/procedures/packages/switch_modules.rb
 - definitions/procedures/packages/uninstall.rb
 - definitions/procedures/packages/unlock_versions.rb
 - definitions/procedures/packages/update.rb