foreman_maintain 0.7.8 → 0.7.9

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: ae46ef9452f9bbb61d9f453a1d3aba399aa39aad83c8340ba2ba7129196eb6ec
-  data.tar.gz: daae5660ce5a676c230b6ef4360e7341f3fdb5d82ce46cc53a0ac3596926ab94
+  metadata.gz: 87bde0596489f26881bb8ee92b9cec10df4aead0e72fb3411a6dc80916949efe
+  data.tar.gz: 0da057d0f9f7b6aaa0e5a2e0484a7adb66ed41eb09f0ef9f7fa32949640d7f92
 SHA512:
-  metadata.gz: 62d82ea9a9d4ece0797e5872b8b0a551940864965416b23f3dfa7a7b054c68b8cd684d76f2cfd85532d6c744ab9f88942b03a8282a43aac96ae2282cb2a715ec
-  data.tar.gz: 00f495d544d54df325d9e0541a0b206dab5fbd2a2f5930e5d17eb86173d450e92926cc41c74379fda20a878ed634c8e473abfaf440d0034ae6c0c44e50c88fe5
+  metadata.gz: 76b77f3b03a65565e8cc4264ce27b9e172bfc1f84c2f9819718e359551f7906c42783e1cd2f50f3a5ad4601445274c92e8fa734c90141da993f7a6777c39d4a6
+  data.tar.gz: 9b1dd4c293088f06b87584857123e74e17f2b7802408a0086d1889b159ef69a904af0b7eb16bc8f9f5a84bca7281d44fa30c4c9c4726853a854ea42f8f81365a

data/definitions/features/service.rb

@@ -25,9 +25,10 @@ class Features::Service < ForemanMaintain::Feature
       select(&:exist?)
   end
 
-  def filtered_services(options)
+  def filtered_services(options, action = '')
     services = include_unregistered_services(existing_services, options[:include])
-    services = filter_services(services, options)
+    services = filter_services(services, options, action)
+
     raise 'No services found matching your parameters' unless services.any?
     return services unless options[:reverse]
 
@@ -61,7 +62,7 @@ class Features::Service < ForemanMaintain::Feature
   def run_action_on_services(action, options, spinner)
     status = 0
     failed_services = []
-    filtered_services(options).each_value do |group|
+    filtered_services(options, action).each_value do |group|
       fork_threads_for_services(action, group, spinner).each do |service, status_and_output|
         spinner.update("#{action_noun(action)} #{service}") if action == 'status'
         item_status, output = status_and_output
@@ -115,7 +116,8 @@ class Features::Service < ForemanMaintain::Feature
     service_list + socket_list
   end
 
-  def filter_services(service_list, options)
+  # rubocop:disable Metrics/AbcSize
+  def filter_services(service_list, options, action)
     if options[:only] && options[:only].any?
       service_list = service_list.select do |service|
         options[:only].any? { |opt| service.matches?(opt) }
@@ -128,8 +130,17 @@ class Features::Service < ForemanMaintain::Feature
     end
 
     service_list = extend_service_list_with_sockets(service_list, options)
+    service_list = filter_disabled_services!(action, service_list)
     service_list.group_by(&:priority).to_h
   end
+  # rubocop:enable Metrics/AbcSize
+
+  def filter_disabled_services!(action, service_list)
+    if %w[start stop restart status].include?(action)
+      service_list.select!(&:enabled?)
+    end
+    service_list
+  end
 
   def include_unregistered_services(service_list, services_filter)
     return service_list unless services_filter

data/definitions/procedures/content/switchover.rb

@@ -19,8 +19,11 @@ module Procedures::Content
       puts execute!('foreman-rake katello:pulp3_content_switchover')
       puts 'Re-running the installer to switch specified content over to pulp3'
       args = ['--foreman-proxy-content-proxy-pulp-isos-to-pulpcore=true',
+              '--foreman-proxy-content-proxy-pulp-yum-to-pulpcore=true',
+              '--foreman-proxy-content-proxy-pulp-deb-to-pulpcore=true',
               '--katello-use-pulp-2-for-file=false',
               '--katello-use-pulp-2-for-docker=false',
+              '--katello-use-pulp-2-for-deb=false',
               '--katello-use-pulp-2-for-yum=false']
       feature(:installer).run(args.join(' '))
     end

data/definitions/procedures/service/base.rb

@@ -16,7 +16,7 @@ module Procedures
       def run_service_action(action, options)
         action_noun = feature(:service).action_noun(action).capitalize
         puts "\n#{action_noun} the following service(s):"
-        services = feature(:service).filtered_services(options)
+        services = feature(:service).filtered_services(options, action)
         print_services(services)
         with_spinner('') do |spinner|
           feature(:service).handle_services(spinner, action, options)

data/lib/foreman_maintain/version.rb

@@ -1,3 +1,3 @@
 module ForemanMaintain
-  VERSION = '0.7.8'.freeze
+  VERSION = '0.7.9'.freeze
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: foreman_maintain
 version: !ruby/object:Gem::Version
-  version: 0.7.8
+  version: 0.7.9
 platform: ruby
 authors:
 - Ivan Nečas
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2021-03-22 00:00:00.000000000 Z
+date: 2021-03-25 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: clamp
@@ -418,7 +418,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.2.3
+rubygems_version: 3.0.9
 signing_key: 
 specification_version: 4
 summary: Foreman maintenance tool belt