foreman_maintain 0.8.8 → 0.8.9

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: f2f43b5ceb85f627566ba0e4708b3bce0875b26a010afdb438c6be123d8f1e6a
-  data.tar.gz: 47e5d5c3f486a5f6b574c76370282d31fd6e162245f5bc627959ff043ba6b680
+  metadata.gz: 627ca822992f4ebce185a35f038a9b4b9f0c9749912a37ee57857f16f62ea3e1
+  data.tar.gz: 64db438426e80728d1af4fa78ceae5686b14662e67bdec2f7dc7306c757d342c
 SHA512:
-  metadata.gz: 1578cc9f64f72126971145298d0ac44949cc254a422511c08e972078f066a88024c5b3400f78756c6a1bf7955e2e2a7bcd24977318a6f2d9a126a28739fa8c08
-  data.tar.gz: a2294861d717873c98a454b83a293402a617bea6aa7f9a44968417eeca6072eee30fa1088c15d0df18853a6cd9c06b73b5638783d9379ad30ec30498eeec5941
+  metadata.gz: 873b36bc6253d38f1ff14b1088dc07a2f074be14c22c97ddf6f770339be344cea9573d5ce054234d382bccd470ec490bac97a5768a9c09eb741db406c3a008ec
+  data.tar.gz: d8e883448c1cae33233dcbe2ec68a0788ab01ed614fba3cf312172caff3986f81826059d5a5c95f1a95dab1deb0eecfaf006d77affaf43ebe794e8317639db72

data/definitions/features/pulpcore.rb

@@ -11,13 +11,21 @@ class Features::Pulpcore < ForemanMaintain::Feature
   end
 
   def services
-    self.class.pulpcore_common_services + [
+    self.class.pulpcore_common_services + configured_workers + [
       system_service('rh-redis5-redis', 5),
-      system_service('pulpcore-worker@*', 20, :all => true, :skip_enablement => true),
       system_service('httpd', 30)
     ]
   end
 
+  def configured_workers
+    names = Dir['/etc/systemd/system/multi-user.target.wants/pulpcore-worker@*.service']
+    names = names.map { |f| File.basename(f) }
+    names.map do |name|
+      system_service(name, 20, :skip_enablement => true,
+                               :instance_parent_unit => 'pulpcore-worker@')
+    end
+  end
+
   def self.pulpcore_migration_services
     pulpcore_common_services + [
       ForemanMaintain::Utils.system_service('pulpcore-worker@1', 20),

data/definitions/scenarios/content.rb

@@ -61,6 +61,7 @@ module ForemanMaintain::Scenarios
       def compose
         if !feature(:satellite) || feature(:satellite).at_least_version?('6.9')
           add_step(Procedures::Content::PrepareAbort)
+          disable_and_stop_services if feature(:satellite)
         end
       end
     end

data/lib/foreman_maintain/version.rb

@@ -1,3 +1,3 @@
 module ForemanMaintain
-  VERSION = '0.8.8'.freeze
+  VERSION = '0.8.9'.freeze
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: foreman_maintain
 version: !ruby/object:Gem::Version
-  version: 0.8.8
+  version: 0.8.9
 platform: ruby
 authors:
 - Ivan Nečas