foreman_maintain 0.2.10 → 0.2.11

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 01b94d288066a77ce5e9203b9dd97258ce49c1ce
-  data.tar.gz: ff691d5547890b714d5f19ce5eadf059ee97bff1
+  metadata.gz: 375b11bcb879988abac384387b1ae48f9cba4685
+  data.tar.gz: af7cd8bd44afcea10e3483328b839550a37c6ab8
 SHA512:
-  metadata.gz: 93a26603996d1d3c0cf5f34357a9db6e55c92b14347b2039b74ed07bb975f9d62c7c0437a95c8743ae183d7baeb227075f97a1fb31e420a859298663f8834a66
-  data.tar.gz: afe06f39673cf070e0eb1a039b97f006036907c53ea6fa54d07d2012ee3c2af25a21bb637571a87dcab6d3b6975900d63b3adfc80f27a5ae03289a87a4fd24a6
+  metadata.gz: aba072d5526230ecca7596e0f180336e61c6e97276de978becbe64b07e9be990d687a0faeeddf9774c31c8f96554a32fbed3f362ccb9bbb23b533ece40594722
+  data.tar.gz: af43c90a8c8a750b86025a595998f9f78253640c21b7869b95662d4604f60eb7dbd871e6d6908756a4ba5c23e575cfba77453ca973cbc0fa93632ed8c820ad9b

data/definitions/checks/disk/performance.rb

@@ -12,7 +12,7 @@ module Checks
         end
       end
 
-      EXPECTED_IO = 80
+      EXPECTED_IO = 60
       DEFAULT_UNIT   = 'MB/sec'.freeze
       DEFAULT_DIRS   = ['/var/lib/pulp', '/var/lib/mongodb', '/var/lib/pgsql'].freeze
 

data/definitions/features/downstream.rb

@@ -76,13 +76,6 @@ class Features::Downstream < ForemanMaintain::Feature
     sat_tools_repo_id = "rhel-#{rh_version_major}-server-satellite-tools-#{sat_version_full}-rpms"
     sat_maintenance_repo_id = "rhel-#{rh_version_major}-server-satellite-maintenance-6-rpms"
 
-    # Override to use Beta repositories for sat version until GA
-    if sat_version.to_s == '6.4'
-      sat_repo_id = "rhel-server-#{rh_version_major}-satellite-6-beta-rpms"
-      sat_tools_repo_id = "rhel-#{rh_version_major}-server-satellite-tools-6-beta-rpms"
-      sat_maintenance_repo_id = "rhel-#{rh_version_major}-server-satellite-maintenance-6-beta-rpms"
-    end
-
     [sat_repo_id, sat_tools_repo_id, sat_maintenance_repo_id]
   end
 

data/definitions/features/puppet.rb

@@ -15,7 +15,9 @@ class Features::Puppet < ForemanMaintain::Feature
       '/var/lib/puppet/foreman_cache_data',
       '/opt/puppetlabs/puppet/ssl/',
       '/var/lib/puppet/ssl',
-      '/var/lib/puppet'
+      '/var/lib/puppet',
+      '/usr/share/ruby/vendor_ruby/puppet/reports/foreman.rb',
+      '/opt/puppetlabs/puppet/lib/ruby/vendor_ruby/puppet/reports/foreman.rb'
     ]
   end
 end

data/definitions/features/service.rb

@@ -45,6 +45,16 @@ class Features::Service < ForemanMaintain::Feature
     options[:reverse] = action == 'stop'
     raise 'Unsupported action detected' unless allowed_action?(action)
 
+    status, failed_services = run_action_on_services(action, options, spinner)
+
+    spinner.update("All services #{action_past_tense(action)}")
+    if action == 'status'
+      raise "Some services are not running (#{failed_services.join(', ')})" if status > 0
+      spinner.update('All services are running')
+    end
+  end
+
+  def run_action_on_services(action, options, spinner)
     status = 0
     failed_services = []
 
@@ -52,24 +62,35 @@ class Features::Service < ForemanMaintain::Feature
       spinner.update("#{action_noun(action)} #{service}")
       item_status, output = service.send(action.to_sym)
 
+      formatted = format_status(output, item_status, options)
+      puts formatted unless formatted.empty?
+
       if item_status > 0
         status = item_status
         failed_services << service
       end
-
-      puts format_status(output)
     end
-
-    spinner.update("All services #{action_past_tense(action)}")
-    raise "Some services are not running (#{failed_services.join(', ')})" if status > 0
+    [status, failed_services]
   end
 
-  def format_status(output)
-    status = "\n"
-    status += output if !output.nil? && !output.empty?
+  def format_status(output, exit_code, options)
+    status = ''
+    if !options[:failing] || exit_code > 0
+      if options[:brief]
+        status += format_brief_status(exit_code)
+      elsif !(output.nil? || output.empty?)
+        status += "\n" + output
+      end
+    end
     status
   end
 
+  def format_brief_status(exit_code)
+    result = exit_code == 0 ? reporter.status_label(:success) : reporter.status_label(:fail)
+    padding = reporter.max_length - reporter.last_line.to_s.length - 30
+    "#{' ' * padding} #{result}"
+  end
+
   def allowed_action?(action)
     %w[start stop restart status enable disable].include?(action)
   end
@@ -118,8 +139,8 @@ class Features::Service < ForemanMaintain::Feature
   end
 
   def run_katello_service(command)
-    puts 'Services are handled by katello-service in Satellite versions 6.2 and earlier. ' \
-         "Redirecting to: \n#{command}\n"
+    puts "Services are handled by katello-service in Satellite versions 6.2 and earlier. \n" \
+         "Flags --brief or --failing will be ignored if present. Redirecting to: \n#{command}\n"
     puts execute(command)
   end
 

data/definitions/procedures/pulp/migrate.rb

@@ -1,5 +1,7 @@
 module Procedures::Pulp
   class Migrate < ForemanMaintain::Procedure
+    include ForemanMaintain::Concerns::SystemService
+
     metadata do
       description 'Migrate pulp db'
       for_feature :pulp
@@ -7,7 +9,7 @@ module Procedures::Pulp
 
     def run
       with_spinner('Migrating pulp') do |spinner|
-        necessary_services = feature(:mongo).services.keys + ['qpidd']
+        necessary_services = feature(:mongo).services + [system_service('qpidd', 10)]
         pulp_services = %w[pulp_celerybeat pulp_workers pulp_resource_manager]
 
         feature(:service).handle_services(spinner, 'start', :only => necessary_services)

data/definitions/procedures/service/status.rb

@@ -5,10 +5,13 @@ module Procedures::Service
     metadata do
       description 'Get status of applicable services'
       Base.common_params(self)
+      param :brief, 'Print only service name and status', :flag => true, :default => false
+      param :failing, 'List only services which are not running', :flag => true, :default => false
     end
 
     def run
-      run_service_action('status', common_options)
+      format_options = { :brief => @brief, :failing => @failing }
+      run_service_action('status', common_options.merge(format_options))
     end
   end
 end

data/definitions/scenarios/services.rb

@@ -151,6 +151,12 @@ module ForemanMaintain::Scenarios
 
       context.map(:exclude,
                   Procedures::Service::Status => :exclude)
+
+      context.map(:brief,
+                  Procedures::Service::Status => :brief)
+
+      context.map(:failing,
+                  Procedures::Service::Status => :failing)
     end
   end
 end

data/lib/foreman_maintain/cli/service_command.rb

@@ -52,11 +52,15 @@ module ForemanMaintain
 
       subcommand 'status', 'Get statuses of applicable services' do
         service_options
+        option ['-b', '--brief'], :flag, 'Print only service name and status'
+        option ['-f', '--failing'], :flag, 'List only services which are not running'
 
         def execute
           scenario = Scenarios::ServiceStatus.new(
             :only => only,
-            :exclude => exclude
+            :exclude => exclude,
+            :brief => brief?,
+            :failing => failing?
           )
 
           run_scenario(scenario)

data/lib/foreman_maintain/reporter/cli_reporter.rb

@@ -68,6 +68,8 @@ module ForemanMaintain
         end
       end
 
+      attr_reader :last_line, :max_length
+
       def initialize(stdout = STDOUT, stdin = STDIN, options = {})
         @stdout = stdout
         @stdin = stdin

data/lib/foreman_maintain/version.rb

@@ -1,3 +1,3 @@
 module ForemanMaintain
-  VERSION = '0.2.10'.freeze
+  VERSION = '0.2.11'.freeze
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: foreman_maintain
 version: !ruby/object:Gem::Version
-  version: 0.2.10
+  version: 0.2.11
 platform: ruby
 authors:
 - Ivan Nečas
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2018-09-21 00:00:00.000000000 Z
+date: 2018-09-25 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: clamp