foreman_maintain 1.3.0 → 1.3.1

data/definitions/features/foreman_database.rb

@@ -28,7 +28,7 @@ class Features::ForemanDatabase < ForemanMaintain::Feature
   def services
     [
       system_service('postgresql', 10, :component => 'foreman',
-                                       :db_feature => feature(:foreman_database))
+                                       :db_feature => feature(:foreman_database)),
     ]
   end
 

data/definitions/features/foreman_proxy.rb

@@ -58,7 +58,7 @@ class Features::ForemanProxy < ForemanMaintain::Feature
       '/var/lib/foreman-proxy/ssh',
       '/etc/smart_proxy_dynflow_core/settings.yml',
       '/etc/sudoers.d/foreman-proxy',
-      settings_file
+      settings_file,
     ]
   end
 

data/definitions/features/foreman_server.rb

@@ -35,13 +35,13 @@ module ForemanMaintain
           '/etc/selinux/targeted/contexts/files/file_contexts.subs',
           '/etc/sysconfig/foreman',
           '/usr/share/ruby/vendor_ruby/puppet/reports/foreman.rb',
-          '/var/lib/foreman'
+          '/var/lib/foreman',
         ]
       end
 
       def config_files_to_exclude
         [
-          '/var/lib/foreman/public'
+          '/var/lib/foreman/public',
         ]
       end
 

data/definitions/features/foreman_tasks.rb

@@ -40,14 +40,14 @@ class Features::ForemanTasks < ForemanMaintain::Feature
     end
   end
 
-  def backup_tasks(state)
-    backup_table('dynflow_execution_plans', state, 'uuid') { |status| yield(status) }
-    backup_table('dynflow_steps', state) { |status| yield(status) }
-    backup_table('dynflow_actions', state) { |status| yield(status) }
+  def backup_tasks(state, &block)
+    backup_table('dynflow_execution_plans', state, 'uuid', &block)
+    backup_table('dynflow_steps', state, &block)
+    backup_table('dynflow_actions', state, &block)
 
     yield('Backup Tasks [running]')
     export_csv("SELECT * FROM foreman_tasks_tasks WHERE #{condition(state)}",
-               'foreman_tasks_tasks.csv', state)
+      'foreman_tasks_tasks.csv', state)
     yield('Backup Tasks [DONE]')
     @backup_dir = nil
   end
@@ -106,9 +106,10 @@ class Features::ForemanTasks < ForemanMaintain::Feature
   def condition(state)
     raise 'Invalid State' unless valid(state)
 
-    if state == :old
+    case state
+    when :old
       old_tasks_condition
-    elsif state == :paused
+    when :paused
       paused_tasks_condition
     else
       tasks_condition(state)
@@ -116,11 +117,7 @@ class Features::ForemanTasks < ForemanMaintain::Feature
   end
 
   def resume_task_using_hammer
-    if feature(:satellite) && feature(:satellite).current_minor_version == '6.8'
-      feature(:hammer).run('task resume --search "" --fields="Total tasks resumed"')
-    else
-      feature(:hammer).run('task resume --fields="Total tasks resumed"')
-    end
+    feature(:hammer).run('task resume --fields="Total tasks resumed"')
   end
 
   def fetch_tasks_status(state, spinner)

data/definitions/features/gofer.rb

@@ -10,7 +10,7 @@ class Features::Gofer < ForemanMaintain::Feature
 
   def services
     [
-      system_service('goferd', 30)
+      system_service('goferd', 30),
     ]
   end
 end

data/definitions/features/hammer.rb

@@ -20,7 +20,7 @@ class Features::Hammer < ForemanMaintain::Feature
   def config_directories
     [
       '~/.hammer/',
-      '/etc/hammer/'
+      '/etc/hammer/',
     ]
   end
 
@@ -122,14 +122,14 @@ class Features::Hammer < ForemanMaintain::Feature
       configuration[:foreman][:username] != username
   end
 
-  def exec_hammer_cmd(cmd, required_json = false)
+  def exec_hammer_cmd(cmd, required_json: false)
     response = run(cmd)
     json_str = parse_json(response) if required_json
-    json_str ? json_str : response
+    json_str || response
   end
 
   def load_configuration
-    config_directories.reverse.each do |path|
+    config_directories.reverse_each do |path|
       full_path = File.expand_path path
       next unless File.directory? full_path
 

data/definitions/features/installer.rb

@@ -66,7 +66,7 @@ class Features::Installer < ForemanMaintain::Feature
       [
         '/usr/local/bin/validate_postgresql_connection.sh',
         '/opt/puppetlabs/puppet/cache/foreman_cache_data',
-        '/opt/puppetlabs/puppet/cache/pulpcore_cache_data'
+        '/opt/puppetlabs/puppet/cache/pulpcore_cache_data',
       ]
   end
 
@@ -111,14 +111,13 @@ class Features::Installer < ForemanMaintain::Feature
   def installer_arguments
     installer_args = ''
 
-    if feature(:foreman_proxy) &&
-       feature(:foreman_proxy).with_content? &&
+    if feature(:foreman_proxy)&.with_content? &&
        check_max_version('foreman-installer', '3.4')
       installer_args += ' --disable-system-checks'
     end
 
-    unless check_min_version('foreman-installer', '2.1')
-      installer_args += ' --upgrade' if can_upgrade?
+    if !check_min_version('foreman-installer', '2.1') && can_upgrade?
+      installer_args += ' --upgrade'
     end
 
     installer_args

data/definitions/features/instance.rb

@@ -43,7 +43,7 @@ class Features::Instance < ForemanMaintain::Feature
   end
 
   def foreman_proxy_with_content?
-    feature(:foreman_proxy) && feature(:foreman_proxy).with_content? && !feature(:katello)
+    feature(:foreman_proxy)&.with_content? && !feature(:katello)
   end
 
   def downstream
@@ -72,7 +72,7 @@ class Features::Instance < ForemanMaintain::Feature
   end
 
   def pulp
-    feature(:pulp2) || feature(:pulpcore)
+    feature(:pulpcore)
   end
 
   def firewall
@@ -85,7 +85,7 @@ class Features::Instance < ForemanMaintain::Feature
 
   private
 
-  # rubocop:disable Metrics/MethodLength, Metrics/AbcSize
+  # rubocop:disable Metrics/AbcSize
   def katello_ping
     res = server_connection.get('/katello/api/ping')
     logger.debug('Called /katello/api/ping')
@@ -95,19 +95,19 @@ class Features::Instance < ForemanMaintain::Feature
       result = create_response(false, response['message'] || response['displayMessage'])
     else # valid response
       failing_components = pick_failing_components(response['services'])
-      if failing_components.empty? # all okay
-        result = create_response(true, 'Success')
-      else # some components not okay
-        result = create_response(false,
-                                 "Some components are failing: #{failing_components.join(', ')}",
-                                 component_services(failing_components))
-      end
+      result = if failing_components.empty? # all okay
+                 create_response(true, 'Success')
+               else # some components not okay
+                 create_response(false,
+                   "Some components are failing: #{failing_components.join(', ')}",
+                   component_services(failing_components))
+               end
     end
     result
   rescue StandardError => e # server error, server down
     create_response(false, "Couldn't connect to the server: #{e.message}")
   end
-  # rubocop:enable Metrics/MethodLength, Metrics/AbcSize
+  # rubocop:enable Metrics/AbcSize
 
   def foreman_ping
     res = server_connection.get('/apidoc/apipie_checksum')
@@ -157,13 +157,11 @@ class Features::Instance < ForemanMaintain::Feature
       'candlepin_auth' => %w[candlepin candlepin_database],
       'candlepin_events' => %w[candlepin candlepin_database],
       'candlepin' => %w[candlepin candlepin_database],
-      'pulp_auth' => %w[pulp2 mongo],
-      'pulp' => %w[pulp2 mongo],
       'pulp3' => %w[pulpcore pulpcore_database],
       'pulp3_content' => %w[pulpcore pulpcore_database],
       'foreman_tasks' => %w[foreman_tasks],
       'katello_agent' => %w[katello],
-      'katello_events' => %w[katello]
+      'katello_events' => %w[katello],
     }
   end
 

data/definitions/features/katello.rb

@@ -10,7 +10,7 @@ class Features::Katello < ForemanMaintain::Feature
   end
 
   def data_dirs
-    @dirs ||= ['/var/lib/pulp', '/var/lib/mongodb', '/var/lib/pgsql']
+    @dirs ||= ['/var/lib/pulp', '/var/lib/pgsql']
   end
 
   def current_version
@@ -18,14 +18,10 @@ class Features::Katello < ForemanMaintain::Feature
   end
 
   def services
-    if feature(:pulp2)
-      []
-    else
-      [
-        system_service('qpidd', 10),
-        system_service('qdrouterd', 10)
-      ]
-    end
+    [
+      system_service('qpidd', 10),
+      system_service('qdrouterd', 10),
+    ]
   end
 
   # rubocop:disable  Metrics/MethodLength
@@ -43,7 +39,7 @@ class Features::Katello < ForemanMaintain::Feature
       '/etc/qpid',
       '/etc/qpid-dispatch',
       '/var/lib/qpidd',
-      '/etc/qpid-dispatch'
+      '/etc/qpid-dispatch',
     ]
 
     if installer_scenario_answers['certs']
@@ -51,7 +47,7 @@ class Features::Katello < ForemanMaintain::Feature
         installer_scenario_answers['certs']['server_cert'],
         installer_scenario_answers['certs']['server_key'],
         installer_scenario_answers['certs']['server_cert_req'],
-        installer_scenario_answers['certs']['server_ca_cert']
+        installer_scenario_answers['certs']['server_ca_cert'],
       ].compact
     end
 
@@ -62,7 +58,7 @@ class Features::Katello < ForemanMaintain::Feature
   def config_files_exclude_for_online
     [
       '/var/lib/qpidd',
-      '/var/lib/candlepin/activemq-artemis'
+      '/var/lib/candlepin/activemq-artemis',
     ]
   end
 

data/definitions/features/pulpcore.rb

@@ -1,6 +1,8 @@
 require 'foreman_maintain/utils/service/systemd'
 
 class Features::Pulpcore < ForemanMaintain::Feature
+  include ForemanMaintain::Concerns::PulpCommon
+
   metadata do
     label :pulpcore
 
@@ -30,21 +32,21 @@ class Features::Pulpcore < ForemanMaintain::Feature
       ForemanMaintain::Utils.system_service('pulpcore-worker@1', 20),
       ForemanMaintain::Utils.system_service('pulpcore-worker@2', 20),
       ForemanMaintain::Utils.system_service('pulpcore-worker@3', 20),
-      ForemanMaintain::Utils.system_service('pulpcore-worker@4', 20)
+      ForemanMaintain::Utils.system_service('pulpcore-worker@4', 20),
     ]
   end
 
   def config_files
     [
       '/etc/pulp/settings.py',
-      '/etc/pulp/certs/database_fields.symmetric.key'
+      '/etc/pulp/certs/database_fields.symmetric.key',
     ]
   end
 
   def self.pulpcore_common_services
     common_services = [
       ForemanMaintain::Utils.system_service('pulpcore-api', 10, :socket => 'pulpcore-api'),
-      ForemanMaintain::Utils.system_service('pulpcore-content', 10, :socket => 'pulpcore-content')
+      ForemanMaintain::Utils.system_service('pulpcore-content', 10, :socket => 'pulpcore-content'),
     ]
     common_services + pulpcore_resource_manager_service
   end

data/definitions/features/pulpcore_database.rb

@@ -20,12 +20,13 @@ class Features::PulpcoreDatabase < ForemanMaintain::Feature
   def services
     [
       system_service('postgresql', 10, :component => 'pulpcore',
-                                       :db_feature => feature(:pulpcore_database))
+                                       :db_feature => feature(:pulpcore_database)),
     ]
   end
 
   private
 
+  # rubocop:disable Metrics/AbcSize
   def load_configuration
     full_config = File.read(PULPCORE_DB_CONFIG).split(/[\s,'":]/).reject(&:empty?)
 
@@ -38,4 +39,5 @@ class Features::PulpcoreDatabase < ForemanMaintain::Feature
     @configuration['password'] = full_config[full_config.index('PASSWORD') + 1]
     @configuration
   end
+  # rubocop:enable Metrics/AbcSize
 end

data/definitions/features/puppet_server.rb

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

data/definitions/features/redis.rb

@@ -13,28 +13,12 @@ class Features::Redis < ForemanMaintain::Feature
   end
 
   def config_files
-    %w[redis redis.conf].map { |config| File.join(self.class.etc_prefix, config) }
+    %w[redis redis.conf].map { |config| File.join('/etc', config) }
   end
 
   class << self
-    SCL_NAME = 'rh-redis5'.freeze
-
-    def etc_prefix
-      if el7?
-        "/etc/opt/rh/#{SCL_NAME}"
-      else
-        '/etc'
-      end
-    end
-
-    def scl_prefix
-      if el7?
-        "#{SCL_NAME}-"
-      end
-    end
-
     def service_name
-      "#{scl_prefix}redis"
+      'redis'
     end
   end
 end

data/definitions/features/salt_server.rb

@@ -10,7 +10,7 @@ class Features::SaltServer < ForemanMaintain::Feature
 
   def config_files
     [
-      '/etc/salt'
+      '/etc/salt',
     ]
   end
 

data/definitions/features/service.rb

@@ -8,16 +8,11 @@ class Features::Service < ForemanMaintain::Feature
     # { :only => ["httpd"] }
     # { :exclude => ["pulp-workers", "tomcat"] }
     # { :include => ["crond"] }
-    if feature(:instance).downstream && feature(:instance).downstream.less_than_version?('6.3')
-      use_katello_service(action, options)
-    else
-      use_system_service(action, options, spinner)
-    end
+    use_system_service(action, options, spinner)
   end
 
   def existing_services
-    ForemanMaintain.available_features.map(&:services).
-      flatten(1).
+    ForemanMaintain.available_features.flat_map(&:services).
       sort.
       inject([]) do |pool, service| # uniq(&:to_s) for ruby 1.8.7
         pool.last.nil? || !pool.last.matches?(service) ? pool << service : pool
@@ -130,16 +125,15 @@ class Features::Service < ForemanMaintain::Feature
     service_list + socket_list
   end
 
-  # rubocop:disable Metrics/AbcSize
   def filter_services(service_list, options, action)
-    if options[:only] && options[:only].any?
+    if options[:only]&.any?
       service_list = service_list.select do |service|
         options[:only].any? { |opt| service.matches?(opt) }
       end
       service_list = include_unregistered_services(service_list, options[:only])
     end
 
-    if options[:exclude] && options[:exclude].any?
+    if options[:exclude]&.any?
       service_list = service_list.reject { |service| options[:exclude].include?(service.name) }
     end
 
@@ -147,7 +141,6 @@ class Features::Service < ForemanMaintain::Feature
     service_list = filter_disabled_services!(action, service_list)
     service_list.group_by(&:priority).to_h
   end
-  # rubocop:enable Metrics/AbcSize
 
   def include_unregistered_services(service_list, services_filter)
     return service_list unless services_filter
@@ -183,44 +176,7 @@ class Features::Service < ForemanMaintain::Feature
     end
   end
 
-  def use_katello_service(action, options)
-    if %w[enable disable].include?(action)
-      raise 'Service enable and disable are only supported in Satellite 6.3+'
-    end
-
-    command = "katello-service #{action} "
-
-    # katello-service in 6.1 does not support --only
-    if feature(:instance).downstream.less_than_version?('6.2')
-      excluded_services = exclude_services_only(options)
-      command += "--exclude #{excluded_services.join(',')}" if excluded_services.any?
-    else
-      command += katello_service_filters(options)
-    end
-
-    run_katello_service(command)
-  end
-
-  def run_katello_service(command)
-    puts "Services are handled by katello-service in Satellite versions 6.2 and earlier. \n" \
-         "Flags --brief or --failing will be ignored if present. \n"\
-         "Similarly, services that are not listed by katello-service will get ignored. \n"\
-         "Redirecting to: \n#{command}\n"
-    puts execute(command)
-  end
-
   def exclude_services_only(options)
     existing_services - filtered_services(options)
   end
-
-  def katello_service_filters(options)
-    filters = ''
-    if options[:exclude] && options[:exclude].any?
-      filters += "--exclude #{options[:exclude].join(',')}"
-    end
-    if options[:only] && options[:only].any?
-      filters += "--only #{options[:only].join(',')}"
-    end
-    filters
-  end
 end

data/definitions/features/sync_plans.rb

@@ -48,12 +48,12 @@ class Features::SyncPlans < ForemanMaintain::Feature
     if @data[:enabled] && key_empty?(:disabled)
       [
         'sync plans: enabled',
-        mode_on ? [Procedures::SyncPlans::Disable.new] : []
+        mode_on ? [Procedures::SyncPlans::Disable.new] : [],
       ]
     else
       [
         'sync plans: disabled',
-        mode_on ? [] : [Procedures::SyncPlans::Enable.new]
+        mode_on ? [] : [Procedures::SyncPlans::Enable.new],
       ]
     end
   end

data/definitions/features/tar.rb

@@ -29,13 +29,13 @@ class Features::Tar < ForemanMaintain::Feature
   def validate_volume_size(size)
     if size.nil? || size !~ /^\d+[bBcGKkMPTw]?$/
       raise ForemanMaintain::Error::Validation,
-            "Please specify size according to 'tar --tape-length' format."
+        "Please specify size according to 'tar --tape-length' format."
     end
     true
   end
 
   # rubocop:disable Metrics/AbcSize, Metrics/MethodLength
-  # rubocop:disable Metrics/CyclomaticComplexity, Metrics/PerceivedComplexity
+  # rubocop:disable Metrics/CyclomaticComplexity
   def tar_command(options)
     volume_size = options.fetch(:volume_size, nil)
     absolute_names = options.fetch(:absolute_names, nil)
@@ -43,6 +43,7 @@ class Features::Tar < ForemanMaintain::Feature
 
     tar_command = ['tar']
     tar_command << '--selinux'
+    tar_command << '--no-check-device'
     tar_command << "--#{options.fetch(:command, 'create')}"
     tar_command << "--file=#{options.fetch(:archive)}"
 
@@ -81,7 +82,7 @@ class Features::Tar < ForemanMaintain::Feature
     tar_command.join(' ')
   end
   # rubocop:enable Metrics/AbcSize, Metrics/MethodLength
-  # rubocop:enable Metrics/CyclomaticComplexity, Metrics/PerceivedComplexity
+  # rubocop:enable Metrics/CyclomaticComplexity
 
   private
 

data/definitions/procedures/backup/compress_data.rb

@@ -8,7 +8,6 @@ module Procedures::Backup
 
     def run
       compress_file('pgsql_data.tar', 'Postgres DB')
-      compress_file('mongo_data.tar', 'Mongo DB')
     end
 
     private

data/definitions/procedures/backup/config_files.rb

@@ -14,14 +14,13 @@ module Procedures::Backup
 
       param :backup_dir, 'Directory where to backup to', :required => true
       param :proxy_features, 'List of proxy features to backup (default: all)',
-            :array => true, :default => ['all']
+        :array => true, :default => ['all']
       param :ignore_changed_files, 'Should packing tar ignore changed files',
-            :flag => true, :default => false
+        :flag => true, :default => false
       param :online_backup, 'The config files are being prepared for an online backup',
-            :flag => true, :default => false
+        :flag => true, :default => false
     end
 
-    # rubocop:disable Metrics/MethodLength
     def run
       logger.debug("Invoking tar from #{FileUtils.pwd}")
       tar_cmd = tar_command
@@ -63,9 +62,11 @@ module Procedures::Backup
     def available_features_config
       configs = []
       exclude_configs = []
+      proxy_scenarios = [:foreman_proxy, :capsule]
+
       ForemanMaintain.available_features.each do |feature|
         # exclude proxy as it has special handling later
-        next if [:foreman_proxy, :capsule].include?(feature.label)
+        next if proxy_scenarios.include?(feature.label)
 
         configs += feature.config_files
         exclude_configs += feature.config_files_to_exclude

data/definitions/procedures/backup/prepare_directory.rb

@@ -8,7 +8,6 @@ module Procedures::Backup
       param :incremental_dir, 'Changes since specified backup only'
     end
 
-    # rubocop:disable Metrics/MethodLength
     def run
       puts "Creating backup folder #{@backup_dir}"
 
@@ -31,6 +30,5 @@ module Procedures::Backup
         end
       end
     end
-    # rubocop:enable Metrics/MethodLength
   end
 end

data/definitions/procedures/backup/pulp.rb

@@ -10,7 +10,7 @@ module Procedures::Backup
       param :mount_dir, 'Snapshot mount directory'
 
       confine do
-        feature(:pulp2) || feature(:pulpcore_database)
+        feature(:pulpcore_database)
       end
     end
 
@@ -30,7 +30,7 @@ module Procedures::Backup
     private
 
     def any_pulp_feature
-      feature(:pulp2) || feature(:pulpcore_database)
+      feature(:pulpcore_database)
     end
 
     def pulp_backup
@@ -52,7 +52,7 @@ module Procedures::Backup
       dir = any_pulp_feature.find_marked_directory(mount_point)
       unless dir
         raise ForemanMaintain::Error::Fail,
-              "Pulp base directory not found in the mount point (#{mount_point})"
+          "Pulp base directory not found in the mount point (#{mount_point})"
       end
       dir
     end

data/definitions/procedures/backup/snapshot/clean_mount.rb

@@ -8,7 +8,7 @@ module Procedures::Backup
       end
 
       def run
-        %w[pulp mongodb pgsql].each do |database|
+        %w[pulp pgsql].each do |database|
           mount_point = File.join(@mount_dir, database)
 
           if File.exist?(mount_point) && !execute("mount|grep #{mount_point}").empty?

data/definitions/procedures/backup/snapshot/logical_volume_confirmation.rb

@@ -23,12 +23,11 @@ module Procedures::Backup
       end
 
       def current_pulp_feature
-        feature(:pulp2) || feature(:pulpcore_database)
+        feature(:pulpcore_database)
       end
 
       def dbs
         dbs = {}
-        dbs[:mongo] = 'Mongo' if db_local?(:mongo)
         dbs[:candlepin_database] = 'Candlepin' if db_local?(:candlepin_database)
         dbs[:foreman_database] = 'Foreman' if db_local?(:foreman_database)
         dbs[:pulpcore_database] = 'Pulpcore' if db_local?(:pulpcore_database)

data/definitions/procedures/backup/snapshot/mount_pulp.rb

@@ -8,7 +8,7 @@ module Procedures::Backup
         MountBase.common_params(self)
         param :skip, 'Skip Pulp content during backup'
         confine do
-          feature(:pulp2) || feature(:pulpcore_database)
+          feature(:pulpcore_database)
         end
       end
 
@@ -25,7 +25,7 @@ module Procedures::Backup
       end
 
       def current_pulp_feature
-        feature(:pulp2) || feature(:pulpcore_database)
+        feature(:pulpcore_database)
       end
     end
   end

data/definitions/procedures/foreman/fix_corrupted_roles.rb

@@ -36,9 +36,9 @@ module Procedures::Foreman
 
     def update_records(set)
       new_filter = create_filter set.first['role_id'],
-                                 set.first['search'],
-                                 set.first['taxonomy_search'],
-                                 set.first['override']
+        set.first['search'],
+        set.first['taxonomy_search'],
+        set.first['override']
       set.each do |item|
         destroy_filtering item
         next if !new_filter || new_filter.empty?