foreman_maintain 0.0.9 → 0.0.10

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: b7df7b95f8a1a9903c19af1e5b49ccfa40008e73
-  data.tar.gz: 70e9f58bfac04116906fb43b19b37c1cd93dc1df
+  metadata.gz: 6541f1ff74d6b4f49f684fdf4a90169407fff41c
+  data.tar.gz: 0de3f21c5ec4b3f20da234dd4ab6de64914e1da4
 SHA512:
-  metadata.gz: a0aa83732512f0daa0d549d805c5ad354df123ac54731e7650912f928bde6ab7ef82a9c59e15da33df4dbf2f3e40ef5a68ebee3e5d028e3290a23c7f7d7a0a2a
-  data.tar.gz: 6b311731eff01767e2aac5ed8cccd45e9e49f019b292e7bde6b59a28300816426f2dcd260549dfe5a716104d5076eda0873562d0ae7483686f015ad563305224
+  metadata.gz: c728131aed58b4939b2d8b2e1d4c0df2adfa192a28523643072ee16a1348f9136feb178987bd4a230ffc123adad54298be86697b6a657956c6c970c49313bb25
+  data.tar.gz: 643d48edb17bd4d7dafc84fd0a80b0404152c9ee77b834b88a4d10c960c107fe5b71bdb2da5a0801552d4cc31017bbe870f55c7b0b1f4154e79a62e2c7dd6ede

data/README.md

@@ -85,7 +85,7 @@ state of the system.
 
 #### Satellite notes
 
-To use custom organzation/activation key for configuring repositories during
+To use custom organization/activation key for configuring repositories during
 upgrade, set the following environment variables
 
 ```
@@ -116,7 +116,7 @@ The definitions for this components are present in `definitions` folder.
 ### Features
 
 Before `foreman_maintain` starts, it takes the set of `features` definition
-and determines their pesence by running their `confine` blocks against
+and determines their presence by running their `confine` blocks against
 the system.
 
 The `confine` block can run an external command to check if the feature
@@ -154,7 +154,7 @@ scenarios) from version-specific nuances.
 Checks define assertions to determine status of the system.
 
 ```ruby
-class Checks::ForemanIsRuning < ForemanMaintain::Check
+class Checks::ForemanIsRunning < ForemanMaintain::Check
   metadata do
     for_feature :foreman
     description 'check foreman service is running'

data/definitions/checks/disk_speed_minimal.rb

@@ -3,12 +3,16 @@ class Checks::DiskSpeedMinimal < ForemanMaintain::Check
     label :disk_io
     description 'Check for recommended disk speed of pulp, mongodb, pgsql dir.'
     tags :pre_upgrade
+
     preparation_steps { Procedures::Packages::Install.new(:packages => %w[hdparm fio]) }
+
+    confine do
+      feature(:katello)
+    end
   end
 
   EXPECTED_IO = 80
-  DEFAULT_UNIT   = 'MB/sec'.freeze
-  DEFAULT_DIRS   = ['/var/lib/pulp', '/var/lib/mongodb', '/var/lib/pgsql'].freeze
+  DEFAULT_UNIT = 'MB/sec'.freeze
 
   def run
     with_spinner(description) do |spinner|
@@ -20,14 +24,14 @@ class Checks::DiskSpeedMinimal < ForemanMaintain::Check
   end
 
   def check_only_single_device?
-    DEFAULT_DIRS.map do |dir|
+    feature(:katello).data_dirs.map do |dir|
       ForemanMaintain::Utils::Disk::Device.new(dir).name
     end.uniq.length <= 1
   end
 
   def dirs_to_check
-    return DEFAULT_DIRS.first(1) if check_only_single_device?
-    DEFAULT_DIRS
+    return feature(:katello).data_dirs.first(1) if check_only_single_device?
+    feature(:katello).data_dirs
   end
 
   private

data/definitions/checks/foreman_tasks/not_running.rb

@@ -9,8 +9,26 @@ module Checks::ForemanTasks
     end
 
     def run
-      assert(feature(:foreman_tasks).running_tasks_count == 0,
-             'There are actively running tasks in the system')
+      task_count = feature(:foreman_tasks).running_tasks_count
+      assert(task_count == 0,
+             failure_message(task_count),
+             :next_steps =>
+               [Procedures::ForemanTasks::FetchTasksStatus.new(:state => 'running'),
+                Procedures::ForemanTasks::UiInvestigate.new(
+                  'search_query' => search_query_for_running_tasks
+                )])
+    end
+
+    private
+
+    def search_query_for_running_tasks
+      'state = running AND '\
+      "label !^(#{Features::ForemanTasks::EXCLUDE_ACTIONS_FOR_RUNNING_TASKS.join(' ')})"
+    end
+
+    def failure_message(task_count)
+      "There are #{task_count} active task(s) in the system." \
+      "\nPlease wait for these to complete or cancel them from the Monitor tab."
     end
   end
 end

data/definitions/checks/hammer_ping.rb

@@ -0,0 +1,16 @@
+class Checks::HammerPing < ForemanMaintain::Check
+  include ForemanMaintain::Concerns::Hammer
+  metadata do
+    label :hammer_ping
+    for_feature :hammer
+    description 'Check whether all services are running using hammer ping'
+    tags :default
+  end
+
+  def run
+    result = feature(:hammer).hammer_ping_cmd
+    assert(result[:success],
+           result[:message],
+           :next_steps => Procedures::KatelloService::Restart.new(:only => result[:data]))
+  end
+end

data/definitions/checks/system_registration.rb

@@ -5,22 +5,18 @@ class Checks::SystemRegistration < ForemanMaintain::Check
     tags :default
 
     confine do
-      file_exists?('/etc/rhsm/rhsm.conf')
+      file_exists?('/etc/rhsm/rhsm.conf') &&
+        !feature(:foreman_server) &&
+        feature(:foreman_proxy)
     end
   end
 
   def run
-    if system_is_self_registerd?
+    if rhsm_hostname_eql_hostname?
       warn! 'System is self registered'
-    else
-      puts 'System is not self registered'
     end
   end
 
-  def system_is_self_registerd?
-    rhsm_hostname.casecmp(hostname).zero?
-  end
-
   def rhsm_hostname
     execute("grep '\\bhostname\\b' < #{rhsm_conf_file}  | grep -v '^#'").sub(/.*?=/, '').strip
   end
@@ -28,4 +24,8 @@ class Checks::SystemRegistration < ForemanMaintain::Check
   def rhsm_conf_file
     '/etc/rhsm/rhsm.conf'
   end
+
+  def rhsm_hostname_eql_hostname?
+    @result ||= rhsm_hostname.casecmp(hostname).zero?
+  end
 end

data/definitions/features/downstream.rb

@@ -34,9 +34,17 @@ class Features::Downstream < ForemanMaintain::Feature
   def rh_repos(sat_version)
     sat_version = version(sat_version)
     rh_version_major = execute!('facter operatingsystemmajrelease')
+
+    sat_repo_id = "rhel-#{rh_version_major}-server-satellite-#{sat_version.major}"\
+                  ".#{sat_version.minor}-rpms"
+    # Override to use Beta repositories for 6.3 until GA
+    if sat_version.to_s == '6.3'
+      sat_repo_id = "rhel-server-#{rh_version_major}-satellite-6-beta-rpms"
+    end
+
     ["rhel-#{rh_version_major}-server-rpms",
      "rhel-server-rhscl-#{rh_version_major}-rpms",
-     "rhel-#{rh_version_major}-server-satellite-#{sat_version.major}.#{sat_version.minor}-rpms"]
+     sat_repo_id]
   end
 
   def version_from_source

data/definitions/features/foreman_proxy.rb

@@ -1,6 +1,9 @@
 class Features::ForemanProxy < ForemanMaintain::Feature
   metadata do
     label :foreman_proxy
+    confine do
+      find_package('foreman-proxy')
+    end
   end
 
   attr_reader :dhcpd_conf_file, :cert_path
@@ -36,7 +39,7 @@ class Features::ForemanProxy < ForemanMaintain::Feature
     array_output = curl_resp.split(/\r\n/)
     result_array = array_output.last.split(/\n/)
     curl_http_status = result_array.delete_at(result_array.length - 1).strip.to_i
-    curl_http_resp = json_parse(result_array.join(''))
+    curl_http_resp = parse_json(result_array.join(''))
     ForemanMaintain::Utils::CurlResponse.new(
       curl_http_resp,
       curl_http_status,

data/definitions/features/foreman_server.rb

@@ -0,0 +1,12 @@
+module ForemanMaintain
+  module Features
+    class ForemanServer < ForemanMaintain::Feature
+      metadata do
+        label :foreman_server
+        confine do
+          server?
+        end
+      end
+    end
+  end
+end

data/definitions/features/foreman_tasks.rb

@@ -1,5 +1,7 @@
 class Features::ForemanTasks < ForemanMaintain::Feature
   MIN_AGE = 30
+  TIMEOUT_FOR_TASKS_STATUS = 300
+  RETRY_INTERVAL_FOR_TASKS_STATE = 10
 
   SAFE_TO_DELETE = %w[
     Actions::Katello::Host::GenerateApplicability
@@ -11,6 +13,11 @@ class Features::ForemanTasks < ForemanMaintain::Feature
     Actions::Katello::EventQueue::Monitor
   ].freeze
 
+  EXCLUDE_ACTIONS_FOR_RUNNING_TASKS = %w[
+    Actions::Candlepin::ListenOnCandlepinEvents
+    Actions::Katello::EventQueue::Monitor
+  ].freeze
+
   metadata do
     label :foreman_tasks
 
@@ -33,10 +40,14 @@ class Features::ForemanTasks < ForemanMaintain::Feature
   end
 
   def running_tasks_count
-    # feature(:foreman_database).query(<<-SQL).first['count'].to_i
-    #  SELECT count(*) AS count FROM foreman_tasks_tasks WHERE state in ('running', 'paused')
-    # SQL
-    0
+    actions_to_exclude = quotize(EXCLUDE_ACTIONS_FOR_RUNNING_TASKS)
+    sql = <<-SQL
+      SELECT count(*) AS count
+        FROM foreman_tasks_tasks
+        WHERE state IN ('running') AND
+        label NOT IN (#{actions_to_exclude})
+    SQL
+    feature(:foreman_database).query(sql).first['count'].to_i
   end
 
   def paused_tasks_count(ignored_tasks = [])
@@ -86,8 +97,42 @@ class Features::ForemanTasks < ForemanMaintain::Feature
     hammer('task resume')
   end
 
+  def fetch_tasks_status(state, spinner)
+    Timeout.timeout(TIMEOUT_FOR_TASKS_STATUS) do
+      check_task_count(state, spinner)
+    end
+  rescue Timeout::Error => e
+    logger.error e.message
+    puts "\nTimeout: #{e.message}. Try again."
+  end
+
   private
 
+  def check_task_count(state, spinner)
+    loop do
+      spinner.update "Try checking status of #{state} task(s)"
+      task_count = call_tasks_count_by_state(state)
+      break if task_count == 0
+      puts "\nThere are #{task_count} #{state} tasks."
+      spinner.update "Waiting #{RETRY_INTERVAL_FOR_TASKS_STATE} seconds before retry."
+      sleep RETRY_INTERVAL_FOR_TASKS_STATE
+    end
+  rescue StandardError => e
+    logger.error e.message
+  end
+
+  def call_tasks_count_by_state(state)
+    case state
+    when 'running'
+      running_tasks_count
+    when 'paused'
+      paused_tasks_count
+    else
+      logger.error "No count method defined for state #{state}."
+      raise "Unsupported for state #{state}."
+    end
+  end
+
   def parent_backup_dir
     File.expand_path(ForemanMaintain.config.backup_dir)
   end

data/definitions/features/hammer.rb

@@ -0,0 +1,55 @@
+class Features::Hammer < ForemanMaintain::Feature
+  metadata do
+    label :hammer
+  end
+
+  SERVICES_MAPPING = {
+    'candlepin_auth' => %w[postgresql tomcat],
+    'candlepin' => %w[postgresql tomcat],
+    'pulp_auth' => %w[pulp_resource_manager pulp_workers pulp_celerybeat],
+    'pulp' => %w[pulp_resource_manager pulp_workers pulp_celerybeat],
+    'foreman_tasks' => %w[foreman-tasks]
+  }.freeze
+
+  def hammer_ping_cmd
+    cmd_output = exec_hammer_cmd('--output json ping', true)
+    return init_result_obj(false, cmd_output) if cmd_output.is_a?(String)
+    resources_failed = find_resources_which_failed(cmd_output.first)
+    return init_result_obj if resources_failed.empty?
+    services = map_resources_with_services(resources_failed)
+    msg_to_show = "#{resources_failed.join(', ')} resource(s) are failing."
+    init_result_obj(false, msg_to_show, services)
+  end
+
+  def find_resources_which_failed(hammer_ping_output)
+    resources_failed = []
+    hammer_ping_output.each do |resource, resp_obj|
+      resources_failed << resource if /FAIL/ =~ resp_obj['Status']
+    end
+    resources_failed
+  end
+
+  private
+
+  def map_resources_with_services(resources)
+    service_names = []
+    resources.each do |resource|
+      service_names.concat(SERVICES_MAPPING[resource])
+    end
+    service_names
+  end
+
+  def init_result_obj(success_val = true, message = '', data = [])
+    {
+      :success => success_val,
+      :message => message,
+      :data => data
+    }
+  end
+
+  def exec_hammer_cmd(cmd, required_json = false)
+    response = ForemanMaintain::Utils::Hammer.instance.run_command(cmd)
+    json_str = parse_json(response) if required_json
+    json_str ? json_str : response
+  end
+end

data/definitions/features/katello.rb

@@ -0,0 +1,17 @@
+class Features::Katello < ForemanMaintain::Feature
+  metadata do
+    label :katello
+
+    confine do
+      find_package('katello')
+    end
+  end
+
+  def data_dirs
+    @dirs ||= ['/var/lib/pulp', '/var/lib/mongodb', '/var/lib/pgsql']
+  end
+
+  def current_version
+    @current_version ||= rpm_version('katello')
+  end
+end

data/definitions/features/katello_service.rb

@@ -3,20 +3,22 @@ class Features::KatelloService < ForemanMaintain::Feature
     label :katello_service
   end
 
+  RETRIES_FOR_SERVICES_RESTART = 5
+  PING_RETRY_INTERVAL = 30
+
   def make_stop(spinner, options = {})
     services = find_services_for_only_filter(running_services, options)
     if services.empty?
       spinner.update 'No katello service running'
-      yield
+      yield if block_given?
     else
       begin
         filters = "--only #{services.join(',')}"
         spinner.update 'Stopping katello running services..'
         execute!("katello-service stop #{filters}")
-        yield
+        yield if block_given?
       ensure
-        spinner.update 'Starting the katello services..'
-        execute("katello-service start #{filters}")
+        start_stopped_services_using_filters(spinner, filters) if block_given?
       end
     end
   end
@@ -27,13 +29,60 @@ class Features::KatelloService < ForemanMaintain::Feature
       spinner.update 'No katello service to start'
     else
       filters = "--only #{services.join(',')}"
-      spinner.update 'Starting the katello services..'
+      spinner.update 'Starting katello services..'
       execute!("katello-service start #{filters}")
     end
   end
 
+  def restart(options = {})
+    if options[:only] || options[:exclude]
+      filters = construct_filters_for_restart(options)
+      execute!("katello-service restart #{filters}")
+    else
+      execute!('katello-service restart')
+    end
+  end
+
+  def hammer_ping_retry(spinner)
+    RETRIES_FOR_SERVICES_RESTART.times do |retry_count|
+      msg = "Try #{retry_count + 1}/#{RETRIES_FOR_SERVICES_RESTART}: checking status by hammer ping"
+      spinner.update msg
+      result = feature(:hammer).hammer_ping_cmd
+      if result[:success]
+        spinner.update 'All services are running.'
+        break
+      elsif retry_count < (RETRIES_FOR_SERVICES_RESTART - 1)
+        apply_sleep_before_retry(spinner, result)
+      end
+    end
+  rescue StandardError => e
+    logger.error e.message
+  end
+
   private
 
+  def apply_sleep_before_retry(spinner, result)
+    puts "\n#{result[:message]}"
+    spinner.update "Waiting #{PING_RETRY_INTERVAL} seconds before retry."
+    sleep PING_RETRY_INTERVAL
+  end
+
+  def construct_filters_for_restart(options)
+    filters = ''
+    if options[:only]
+      filters += "--only #{options[:only].join(',')}" unless options[:only].empty?
+    end
+    if options[:exclude]
+      filters += "--exclude #{options[:exclude].join(',')}" unless options[:exclude].empty?
+    end
+    filters
+  end
+
+  def start_stopped_services_using_filters(spinner, filters)
+    spinner.update 'Starting katello services..'
+    execute("katello-service start #{filters}")
+  end
+
   def find_services_for_only_filter(curr_services, options)
     defaults = { :only => [], :exclude => [] }
     options = defaults.merge(options)

data/definitions/procedures/foreman_tasks/fetch_tasks_status.rb

@@ -0,0 +1,15 @@
+module Procedures::ForemanTasks
+  class FetchTasksStatus < ForemanMaintain::Procedure
+    metadata do
+      for_feature :foreman_tasks
+      description 'Fetch tasks status and wait till they finish'
+      param :state, :required => true
+    end
+
+    def run
+      with_spinner("waiting for #{@state} tasks to finish") do |spinner|
+        feature(:foreman_tasks).fetch_tasks_status(@state, spinner)
+      end
+    end
+  end
+end

data/definitions/procedures/foreman_tasks/ui_investigate.rb

@@ -12,7 +12,7 @@ module Procedures::ForemanTasks
     def run
       ask(<<-MESSAGE.strip_heredoc)
         Go to https://#{hostname}/foreman_tasks/tasks?search=#{CGI.escape(@search_query.to_s)}
-        press ENTER after the paused tasks are resolved.
+        press ENTER after the tasks are resolved.
       MESSAGE
     end
   end

data/definitions/procedures/katello_service/restart.rb

@@ -0,0 +1,24 @@
+module Procedures::KatelloService
+  class Restart < ForemanMaintain::Procedure
+    metadata do
+      description 'katello-service restart'
+      param :only, 'A comma-separated list of services to include', :array => true
+      param :exclude, 'A comma-separated list of services to skip', :array => true
+    end
+
+    def run
+      with_spinner('restarting katello service(s)') do |spinner|
+        spinner.update('Restarting services')
+        feature(:katello_service).restart(:only => @only, :exclude => @exclude)
+        feature(:katello_service).hammer_ping_retry(spinner)
+      end
+    end
+
+    def runtime_message
+      msg = 'katello-service restart'
+      msg += "--only #{@only.join(',')}" unless @only.empty?
+      msg += "--exclude #{@exclude.join(',')}" unless @exclude.empty?
+      msg
+    end
+  end
+end

data/definitions/procedures/katello_service/start.rb

@@ -0,0 +1,19 @@
+module Procedures::KatelloService
+  class Start < ForemanMaintain::Procedure
+    metadata do
+      description 'katello-service start'
+      param :only, 'A comma-separated list of services to include', :array => true
+      param :exclude, 'A comma-separated list of services to skip', :array => true
+      for_feature :katello_service
+      tags :katello_service_start
+    end
+
+    def run
+      with_spinner('stopping katello service(s)') do |spinner|
+        feature(:katello_service).make_start(
+          spinner, :only => @only, :exclude => @exclude
+        )
+      end
+    end
+  end
+end

data/definitions/procedures/katello_service/stop.rb

@@ -0,0 +1,17 @@
+module Procedures::KatelloService
+  class Stop < ForemanMaintain::Procedure
+    metadata do
+      description 'katello-service stop'
+      param :only, 'A comma-separated list of services to include', :array => true
+      param :exclude, 'A comma-separated list of services to skip', :array => true
+      for_feature :katello_service
+      tags :katello_service_stop
+    end
+
+    def run
+      with_spinner('stopping katello service(s)') do |spinner|
+        feature(:katello_service).make_stop(spinner, :only => @only, :exclude => @exclude)
+      end
+    end
+  end
+end

data/definitions/scenarios/upgrade_to_satellite_6_2.rb

@@ -32,6 +32,7 @@ module Scenarios::Satellite_6_2
 
     def compose
       add_steps(find_procedures(:pre_migrations))
+      add_step(Procedures::KatelloService::Stop.new)
     end
   end
 
@@ -43,7 +44,7 @@ module Scenarios::Satellite_6_2
 
     def compose
       add_step(Procedures::Repositories::Setup.new(:version => '6.2'))
-      add_step(Procedures::Packages::Update.new(:assumeyes => false))
+      add_step(Procedures::Packages::Update.new(:assumeyes => true))
       add_step(Procedures::Installer::Upgrade.new)
     end
   end
@@ -55,6 +56,7 @@ module Scenarios::Satellite_6_2
     end
 
     def compose
+      add_step(Procedures::KatelloService::Start.new)
       add_steps(find_procedures(:post_migrations))
     end
   end

data/definitions/scenarios/upgrade_to_satellite_6_2_z.rb

@@ -32,6 +32,7 @@ module Scenarios::Satellite_6_2_z
 
     def compose
       add_steps(find_procedures(:pre_migrations))
+      add_step(Procedures::KatelloService::Stop.new)
     end
   end
 
@@ -42,7 +43,7 @@ module Scenarios::Satellite_6_2_z
     end
 
     def compose
-      add_step(Procedures::Packages::Update.new(:assumeyes => false))
+      add_step(Procedures::Packages::Update.new(:assumeyes => true))
       add_step(Procedures::Installer::Upgrade.new)
     end
   end
@@ -54,6 +55,7 @@ module Scenarios::Satellite_6_2_z
     end
 
     def compose
+      add_step(Procedures::KatelloService::Start.new)
       add_steps(find_procedures(:post_migrations))
     end
   end

data/definitions/scenarios/upgrade_to_satellite_6_3.rb

@@ -32,6 +32,7 @@ module Scenarios::Satellite_6_3
 
     def compose
       add_steps(find_procedures(:pre_migrations))
+      add_step(Procedures::KatelloService::Stop.new)
     end
   end
 
@@ -43,7 +44,7 @@ module Scenarios::Satellite_6_3
 
     def compose
       add_step(Procedures::Repositories::Setup.new(:version => '6.3'))
-      add_step(Procedures::Packages::Update.new(:assumeyes => false))
+      add_step(Procedures::Packages::Update.new(:assumeyes => true))
       add_step(Procedures::Installer::Upgrade.new)
     end
   end
@@ -55,6 +56,7 @@ module Scenarios::Satellite_6_3
     end
 
     def compose
+      add_step(Procedures::KatelloService::Start.new)
       add_steps(find_procedures(:post_migrations))
     end
   end

data/definitions/scenarios/upgrade_to_satellite_6_3_z.rb

@@ -32,6 +32,7 @@ module Scenarios::Satellite_6_3_z
 
     def compose
       add_steps(find_procedures(:pre_migrations))
+      add_step(Procedures::KatelloService::Stop.new)
     end
   end
 
@@ -42,7 +43,7 @@ module Scenarios::Satellite_6_3_z
     end
 
     def compose
-      add_step(Procedures::Packages::Update.new(:assumeyes => false))
+      add_step(Procedures::Packages::Update.new(:assumeyes => true))
       add_step(Procedures::Installer::Upgrade.new)
     end
   end
@@ -54,6 +55,7 @@ module Scenarios::Satellite_6_3_z
     end
 
     def compose
+      add_step(Procedures::KatelloService::Start.new)
       add_steps(find_procedures(:post_migrations))
     end
   end

data/lib/foreman_maintain/cli/advanced/procedure/abstract_by_tag_command.rb

@@ -4,7 +4,7 @@ module ForemanMaintain
       class AbstractByTagCommand < AbstractProcedureCommand
         def self.tag_params_to_options(tag)
           params = params_for_tag(tag)
-          params.values.each do |param|
+          params.each_value do |param|
             mapping = param[:procedures]
             instance = param[:instance]
             param_to_option(instance, :description => instance.description + " #{mapping}")
@@ -14,7 +14,7 @@ module ForemanMaintain
         def self.params_for_tag(tag)
           params = {}
           ForemanMaintain.available_procedures(:tags => tag).each do |procedure|
-            procedure.params.values.each do |param|
+            procedure.params.each_value do |param|
               unless params.key?(param.name)
                 params[param.name] = { :instance => param, :procedures => [] }
               end

data/lib/foreman_maintain/cli/transform_clamp_options.rb

@@ -17,7 +17,7 @@ module ForemanMaintain
         def get_params_for(definition)
           all_params = options_to_params
           params = {}
-          definition.params.values.each do |param|
+          definition.params.each_value do |param|
             params[param.name] = all_params[param.name]
           end
           params
@@ -37,7 +37,7 @@ module ForemanMaintain
 
       module ParamsToOptions
         def params_to_options(params)
-          params.values.each do |param|
+          params.each_value do |param|
             param_to_option(param)
           end
         end

data/lib/foreman_maintain/cli/upgrade_command.rb

@@ -66,7 +66,12 @@ module ForemanMaintain
       subcommand 'run', 'Run full upgrade to a specified version' do
         target_version_option
         interactive_option
-        option '--phase', 'phase', 'run only a specific phase', :required => false
+        option '--phase', 'phase', 'run only a specific phase', :required => false do |phase|
+          unless UpgradeRunner::PHASES.include?(phase.to_sym)
+            raise Error::UsageError, "Unknown phase #{phase}"
+          end
+          phase
+        end
 
         def execute
           if phase

data/lib/foreman_maintain/concerns/system_helpers.rb

@@ -26,16 +26,69 @@ module ForemanMaintain
         end
       end
 
-      def hostname
-        execute('hostname -f')
+      def check_min_version(name, minimal_version)
+        current_version = package_version(name)
+        if current_version
+          return current_version >= version(minimal_version)
+        end
+      end
+
+      def downstream_installation?
+        execute?('rpm -q satellite') ||
+          (execute('rpm -q foreman') =~ /sat.noarch/)
+      end
+
+      def execute?(command, input = nil)
+        execute(command, :stdin => input)
+        $CHILD_STATUS.success?
+      end
+
+      def execute!(command, options = {})
+        command_runner = Utils::CommandRunner.new(logger, command, options)
+        execution.puts '' if command_runner.interactive? && respond_to?(:execution)
+        command_runner.run
+        if command_runner.success?
+          command_runner.output
+        else
+          raise command_runner.execution_error
+        end
+      end
+
+      def execute(command, options = {})
+        command_runner = Utils::CommandRunner.new(logger, command, options)
+        execution.puts '' if command_runner.interactive? && respond_to?(:execution)
+        command_runner.run
+        command_runner.output
       end
 
       def file_exists?(filename)
         File.exist?(filename)
       end
 
-      def version(value)
-        Version.new(value)
+      def find_package(name)
+        result = execute(%(rpm -q '#{name}'))
+        if $CHILD_STATUS.success?
+          result
+        end
+      end
+
+      def hostname
+        execute('hostname -f')
+      end
+
+      def install_packages(packages, options = {})
+        options.validate_options!(:assumeyes)
+        yum_options = []
+        yum_options << '-y' if options[:assumeyes]
+        execute!("yum #{yum_options.join(' ')} install #{packages.join(' ')}", :interactive => true)
+      end
+
+      def server?
+        find_package('foreman')
+      end
+
+      def smart_proxy?
+        !server? && find_package('foreman-proxy')
       end
 
       def packages_action(action, packages, options = {})
@@ -50,30 +103,11 @@ module ForemanMaintain
                  :interactive => true)
       end
 
-      def check_min_version(name, minimal_version)
-        current_version = package_version(name)
-        if current_version
-          return current_version >= version(minimal_version)
-        end
-      end
-
-      def downstream_installation?
-        execute?('rpm -q satellite') ||
-          (execute('rpm -q foreman') =~ /sat.noarch/)
-      end
-
       def package_version(name)
         # space for extension to support non-rpm distributions
         rpm_version(name)
       end
 
-      def rpm_version(name, queryformat = 'VERSION')
-        rpm_version = execute(%(rpm -q '#{name}' --queryformat="%{#{queryformat}}"))
-        if $CHILD_STATUS.success?
-          version(rpm_version)
-        end
-      end
-
       def parse_csv(data)
         parsed_data = CSV.parse(data)
         header = parsed_data.first
@@ -82,37 +116,25 @@ module ForemanMaintain
         end
       end
 
-      def execute?(command, input = nil)
-        execute(command, :stdin => input)
-        $CHILD_STATUS.success?
+      def parse_json(json_string)
+        JSON.parse(json_string)
+      rescue StandardError
+        nil
       end
 
-      def execute!(command, options = {})
-        command_runner = Utils::CommandRunner.new(logger, command, options)
-        execution.puts '' if command_runner.interactive? && respond_to?(:execution)
-        command_runner.run
-        if command_runner.success?
-          command_runner.output
-        else
-          raise command_runner.execution_error
+      def rpm_version(name)
+        rpm_version = execute(%(rpm -q '#{name}' --queryformat="%{VERSION}"))
+        if $CHILD_STATUS.success?
+          version(rpm_version)
         end
       end
 
-      def execute(command, options = {})
-        command_runner = Utils::CommandRunner.new(logger, command, options)
-        execution.puts '' if command_runner.interactive? && respond_to?(:execution)
-        command_runner.run
-        command_runner.output
-      end
-
       def shellescape(string)
         Shellwords.escape(string)
       end
 
-      def json_parse(json_string)
-        JSON.parse(json_string)
-      rescue
-        nil
+      def version(value)
+        Version.new(value)
       end
     end
   end

data/lib/foreman_maintain/config.rb

@@ -35,7 +35,7 @@ module ForemanMaintain
           "Config file #{config_file} not found, using default configuration"
         {}
       end
-    rescue => e
+    rescue StandardError => e
       raise "Couldn't load configuration file. Error: #{e.message}"
     end
 
@@ -51,7 +51,7 @@ module ForemanMaintain
       dir_path = File.expand_path(dir_path_str)
       begin
         FileUtils.mkdir_p(dir_path, :mode => 0o750) unless File.exist?(dir_path)
-      rescue => e
+      rescue StandardError => e
         $stderr.puts "No permissions to create dir #{dir_path_str}"
         $stderr.puts e.message.inspect
       end

data/lib/foreman_maintain/detector.rb

@@ -67,7 +67,7 @@ module ForemanMaintain
       return if @all_features_scanned
       @available_features = []
       @features_by_label = {}
-      autodetect_features.keys.each do |label|
+      autodetect_features.each_key do |label|
         detect_feature(label)
       end
       @all_features_scanned = true

data/lib/foreman_maintain/executable.rb

@@ -8,8 +8,6 @@ module ForemanMaintain
                    :assumeyes?, :whitelisted?,
                    :execution, :puts, :print, :with_spinner, :ask, :storage
 
-    attr_accessor :associated_feature
-
     def initialize(options = {})
       @options = options.inject({}) { |h, (k, v)| h.update(k.to_s => v) }
       @param_values = {}
@@ -33,7 +31,7 @@ module ForemanMaintain
     # processes the params from provided options
     def setup_params
       @options.validate_options!(params.values.map(&:name).map(&:to_s))
-      params.values.each do |param|
+      params.each_value do |param|
         set_param_variable(param.name, param.process(@options[param.name.to_s]))
       end
     end

data/lib/foreman_maintain/runner/execution.rb

@@ -97,7 +97,7 @@ module ForemanMaintain
 
       def capture_errors
         yield
-      rescue => e
+      rescue StandardError => e
         @status = :fail
         @output << e.message
         logger.error(e)

data/lib/foreman_maintain/utils/disk/io/block_device.rb

@@ -5,7 +5,7 @@ module ForemanMaintain
         class BlockDevice
           include ForemanMaintain::Concerns::SystemHelpers
 
-          attr_accessor :dir, :unit, :read_speed, :name
+          attr_accessor :dir, :name
 
           def initialize(dir, name = Disk::Device.new('/var').name)
             @dir = dir

data/lib/foreman_maintain/utils/disk/io/file_system.rb

@@ -5,7 +5,7 @@ module ForemanMaintain
         class FileSystem
           include ForemanMaintain::Concerns::SystemHelpers
 
-          attr_accessor :dir, :unit, :read_speed, :name
+          attr_accessor :dir, :name
 
           def initialize(dir, name = '')
             @dir = dir

data/lib/foreman_maintain/version.rb

@@ -1,3 +1,3 @@
 module ForemanMaintain
-  VERSION = '0.0.9'.freeze
+  VERSION = '0.0.10'.freeze
 end

data/lib/foreman_maintain.rb

@@ -6,6 +6,7 @@ require 'forwardable'
 require 'json'
 require 'logger'
 require 'yaml'
+require 'timeout'
 
 module ForemanMaintain
   require 'foreman_maintain/core_ext'
@@ -110,7 +111,7 @@ module ForemanMaintain
 
     def storage(label = :default)
       ForemanMaintain::YamlStorage.load(label)
-    rescue => e
+    rescue StandardError => e
       logger.error "Invalid Storage label i.e #{label}. Error - #{e.message}"
     end
   end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: foreman_maintain
 version: !ruby/object:Gem::Version
-  version: 0.0.9
+  version: 0.0.10
 platform: ruby
 authors:
 - Ivan Nečas
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-09-14 00:00:00.000000000 Z
+date: 2017-10-18 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: clamp
@@ -116,21 +116,29 @@ files:
 - definitions/checks/foreman_tasks/invalid/check_planning_state.rb
 - definitions/checks/foreman_tasks/not_paused.rb
 - definitions/checks/foreman_tasks/not_running.rb
+- definitions/checks/hammer_ping.rb
 - definitions/checks/system_registration.rb
 - definitions/features/downstream.rb
 - definitions/features/foreman_1_11_x.rb
 - definitions/features/foreman_1_7_x.rb
 - definitions/features/foreman_database.rb
 - definitions/features/foreman_proxy.rb
+- definitions/features/foreman_server.rb
 - definitions/features/foreman_tasks.rb
+- definitions/features/hammer.rb
+- definitions/features/katello.rb
 - definitions/features/katello_service.rb
 - definitions/features/sync_plans.rb
 - definitions/features/upstream.rb
 - definitions/procedures/foreman_tasks/delete.rb
+- definitions/procedures/foreman_tasks/fetch_tasks_status.rb
 - definitions/procedures/foreman_tasks/resume.rb
 - definitions/procedures/foreman_tasks/ui_investigate.rb
 - definitions/procedures/hammer_setup.rb
 - definitions/procedures/installer/upgrade.rb
+- definitions/procedures/katello_service/restart.rb
+- definitions/procedures/katello_service/start.rb
+- definitions/procedures/katello_service/stop.rb
 - definitions/procedures/maintenance_mode/disable.rb
 - definitions/procedures/maintenance_mode/enable.rb
 - definitions/procedures/packages/install.rb
@@ -211,7 +219,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.5.2
+rubygems_version: 2.6.12
 signing_key: 
 specification_version: 4
 summary: Foreman maintenance tool belt