foreman_maintain 0.8.13 → 0.8.14

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 9f247f20d9177502cf10ecbb9664d0c6094114b55abd709894d5b960fe98d55c
-  data.tar.gz: 4a282b9e7fc70bcf31c3feafef6b57fa42a8f6c1ccf18859dcbfb83e5405a17e
+  metadata.gz: dd10fbb7ea045524f1a2f24b1f7d9612de64014f20e0a6a60830b75738eb334c
+  data.tar.gz: 21e55c6b7929b2249208f26d0a98df52561c84b34c0d0e0f8aa8dcea921cca67
 SHA512:
-  metadata.gz: ca0f159a201900afac9898668d613b07cc428df855d09ebb50ff3b3673ac18becafc0688b9feda8691db049d97134505e38a13581ee259ab53af4cc28badddbe
-  data.tar.gz: 68d4560b3e2ac1aa98ee5fbd8fdb03b653b49c4d93ff7f57eb8c808881f88e8abf0f0aae21ee4eb86939cc82d2b86f129f1439d65f0334f317c3566048160f1d
+  metadata.gz: 276b4894c0fd83a8bcc0ca62e8dc9f84dc5a8bc0c408a5ae0f78aecae2f054d9efffad8511c5f82b2239e63cf7cea977db8f7a6023cef9c0a96ae6d4c42f919c
+  data.tar.gz: 7cbc0990803e6154f9b1e89c790648f9b6b6c7af193b29252241f62a1159075f4f35e566306bb8252333a0f1108258190dd0685d2fd1925789f18a2aca928367

data/definitions/scenarios/upgrade_to_satellite_6_10.rb

@@ -63,15 +63,24 @@ module Scenarios::Satellite_6_10
       end
     end
 
-    def compose
-      check_var_lib_pulp
-
+    def pulp3_switchover_steps
       add_step(Procedures::Service::Start)
       add_step(Procedures::Service::Enable.
           new(:only => Features::Pulpcore.pulpcore_migration_services))
       add_step(Procedures::Service::Start.
           new(:only => Features::Pulpcore.pulpcore_migration_services))
       add_step(Procedures::Content::Switchover.new(:skip_deb => true))
+      add_step(Procedures::Service::Stop.
+                 new(:only => Features::Pulpcore.pulpcore_migration_services))
+      add_step(Procedures::Service::Disable.
+                 new(:only => Features::Pulpcore.pulpcore_migration_services))
+    end
+
+    def compose
+      check_var_lib_pulp
+      unless check_min_version(foreman_plugin_name('katello'), '4.0')
+        pulp3_switchover_steps
+      end
       add_step(Procedures::Repositories::Setup.new(:version => '6.10'))
       add_step(Procedures::Packages::UnlockVersions.new)
       add_step(Procedures::Packages::Update.new(:assumeyes => true))

data/lib/foreman_maintain/version.rb

@@ -1,3 +1,3 @@
 module ForemanMaintain
-  VERSION = '0.8.13'.freeze
+  VERSION = '0.8.14'.freeze
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: foreman_maintain
 version: !ruby/object:Gem::Version
-  version: 0.8.13
+  version: 0.8.14
 platform: ruby
 authors:
 - Ivan Nečas
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2021-08-31 00:00:00.000000000 Z
+date: 2021-09-08 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: clamp