foreman_maintain 0.6.3 → 0.6.8

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: ee3a3147fb6baeb783edbdcdfb4b595d50fbc6f7540c95f0f1d673bd87a53cf1
-  data.tar.gz: 3586008b3cc66eb7733113144c0004cd9ce1553fe1b9d8f84e5126f5ddc2cadb
+  metadata.gz: db720ab5cd56f2afbb74ccd75c4f8a479f2a4547c419b3b0f7b6d937e4df475a
+  data.tar.gz: b97c27565dc68d5395c4b163486d3c2758de583faae7282934608d66d9230dd1
 SHA512:
-  metadata.gz: e5df43e8cd8514d5489351ace62f2c37ff3558316faf2a9b475f4bd8eb5b624175dbb589ffef216df01feea18cb6a4592466afc8b32ccaca344c0280fafe99fb
-  data.tar.gz: 3c03b1e96a98c2d5800d69633c0584e8cd5632c1c663039a556e8bb63cd8cf45623a57c325266c9e3323d740424c683f6d29d5b53dbd23465a5fb7de56ec7d32
+  metadata.gz: 155e47d65bd4d8d0355e6a60133ddf4a14dd2c2604dfa5e793412e7bb07d9eb9df457f91d889396fd42ed6c9abd0a8347b6ae18afa51428567d8dfddee698489
+  data.tar.gz: 52ca518f6fad0fa372d8a7a132858b4503580e016024996efdb06fda7eab4672fd23e9074c3127e15459606aab256ea6f7ff7538c57fe7f23ea2fb41b69f4c9e

data/definitions/checks/check_hotfix_installed.rb

@@ -4,7 +4,8 @@ class Checks::CheckHotfixInstalled < ForemanMaintain::Check
     description 'Check to verify if any hotfix installed on system'
     tags :pre_upgrade
     preparation_steps do
-      Procedures::Packages::Install.new(:packages => %w[yum-utils])
+      [Checks::Repositories::CheckNonRhRepository.new,
+       Procedures::Packages::Install.new(:packages => %w[yum-utils])]
     end
 
     confine do

data/definitions/checks/disk/performance.rb

@@ -3,8 +3,15 @@ module Checks
     class Performance < ForemanMaintain::Check
       metadata do
         label :disk_performance
-        tags :pre_upgrade
-        preparation_steps { Procedures::Packages::Install.new(:packages => %w[fio]) }
+        preparation_steps do
+          if feature(:instance).downstream
+            [Checks::Repositories::CheckNonRhRepository.new,
+             Procedures::Packages::Install.new(:packages => %w[fio])]
+          else
+            [Procedures::Packages::Install.new(:packages => %w[fio])]
+          end
+        end
+
         confine do
           feature(:instance).pulp
         end

data/definitions/checks/env_proxy.rb

@@ -0,0 +1,13 @@
+class Checks::EnvProxy < ForemanMaintain::Check
+  metadata do
+    label :env_proxy
+    tags :env_proxy
+    description 'Check to make sure no HTTP(S) proxy set in ENV'
+  end
+
+  def run
+    variables = %w[http_proxy https_proxy HTTP_PROXY HTTPS_PROXY]
+    has_proxy_set = true if variables.map { |variable| ENV[variable] }.compact.any?
+    assert(has_proxy_set, 'Global HTTP(S) proxy in environment (env) is set. Please unset first!')
+  end
+end

data/definitions/checks/foreman/check_corrupted_roles.rb

@@ -14,14 +14,22 @@ module Checks
       def run
         items = find_filter_permissions
         assert(items.empty?,
-               'There are user roles with inconsistent filters',
+               error_message(items),
                :next_steps => Procedures::Foreman::FixCorruptedRoles.new)
       end
 
+      def error_message(items)
+        roles = items.map { |item| item['role_name'] }.uniq
+        'There are filters having permissions with multiple resource types. ' \
+        'Roles with such filters are:' \
+        "\n#{roles.join("\n")}"
+      end
+
       def find_filter_permissions
         feature(:foreman_database).query(self.class.inconsistent_filter_perms)
       end
 
+      # rubocop:disable Metrics/MethodLength
       def self.inconsistent_filter_perms
         subquery = <<-SQL
           SELECT filters.id AS filter_id,
@@ -32,14 +40,17 @@ module Checks
                  filterings.id AS filtering_id,
                  permissions.id AS permission_id,
                  permissions.name AS permission_name,
-                 permissions.resource_type
+                 permissions.resource_type,
+                 roles.name AS role_name
           FROM filters INNER JOIN filterings ON filters.id = filterings.filter_id
                        INNER JOIN permissions ON permissions.id = filterings.permission_id
+                       INNER JOIN roles ON filters.role_id = roles.id
         SQL
 
         <<-SQL
           SELECT DISTINCT first.filter_id,
                           first.role_id,
+                          first.role_name,
                           first.filtering_id,
                           first.permission_id,
                           first.permission_name,
@@ -54,6 +65,7 @@ module Checks
                 OR (first.resource_type != second.resource_type))
         SQL
       end
+      # rubocop:enable Metrics/MethodLength
     end
   end
 end

data/definitions/checks/foreman_proxy/check_tftp_storage.rb

@@ -0,0 +1,52 @@
+module Checks::ForemanProxy
+  class CheckTftpStorage < ForemanMaintain::Check
+    metadata do
+      label :check_tftp_storage
+      description 'Clean old Kernel and initramfs files from tftp-boot'
+      tags :default
+      confine do
+        feature(:satellite) && feature(:foreman_proxy) &&
+          feature(:foreman_proxy).features.include?('tftp') && non_zero_token_duration?
+      end
+    end
+
+    def run
+      if Dir.exist?(tftp_boot_directory)
+        files = old_files_from_tftp_boot
+        assert(files.empty?,
+               'There are old initrd and vmlinuz files present in tftp',
+               :next_steps => Procedures::Files::Remove.new(:files => files))
+      else
+        skip "TFTP #{tftp_boot_directory} directory doesn't exist."
+      end
+    end
+
+    def old_files_from_tftp_boot
+      Dir.entries(tftp_boot_directory).map do |file|
+        unless File.directory?(file)
+          file_path =  tftp_boot_directory + file
+          file_path if File.mtime(file_path) + (token_duration * 60) < Time.now
+        end
+      end.compact
+    end
+
+    def self.non_zero_token_duration?
+      lookup_token_duration != 0
+    end
+
+    def tftp_boot_directory
+      @tftp_boot_directory ||= "#{feature(:foreman_proxy).tftp_root_directory}/boot/"
+    end
+
+    def token_duration
+      @token_duration ||= self.class.lookup_token_duration
+    end
+
+    def self.lookup_token_duration
+      data = feature(:foreman_database). \
+             query("select s.value, s.default from settings s \
+                    where category = 'Setting::Provisioning' and name = 'token_duration'")
+      YAML.load(data[0]['value'] || data[0]['default'])
+    end
+  end
+end

data/definitions/checks/repositories/check_non_rh_repository.rb

@@ -0,0 +1,23 @@
+module Checks::Repositories
+  class CheckNonRhRepository < ForemanMaintain::Check
+    metadata do
+      label :check_non_redhat_repository
+      description 'Check whether system has any non Red Hat repositories (e.g.: EPEL) enabled'
+      tags :pre_upgrade
+      confine do
+        feature(:instance).downstream
+      end
+    end
+
+    def run
+      with_spinner('Checking repositories enabled on the system') do
+        assert(!epel_enabled?, 'System is subscribed to non Red Hat repositories')
+      end
+    end
+
+    def epel_enabled?
+      system_repos = execute("yum repolist enabled -d 6 -e 0| grep -E 'Repo-baseurl|Repo-id'")
+      system_repos.to_s.match(/\bepel\b/i)
+    end
+  end
+end

data/definitions/checks/repositories/check_upstream_repository.rb

@@ -4,7 +4,8 @@ class Checks::CheckUpstreamRepository < ForemanMaintain::Check
     description 'Check if any upstream repositories are enabled on system'
     tags :pre_upgrade
     preparation_steps do
-      Procedures::Packages::Install.new(:packages => %w[yum-utils])
+      [Checks::Repositories::CheckNonRhRepository.new,
+       Procedures::Packages::Install.new(:packages => %w[yum-utils])]
     end
     confine do
       feature(:instance).downstream

data/definitions/checks/repositories/validate.rb

@@ -3,7 +3,8 @@ module Checks::Repositories
     metadata do
       description 'Validate availability of repositories'
       preparation_steps do
-        Procedures::Packages::Install.new(:packages => [ForemanMaintain::Utils::Facter.package])
+        [Checks::Repositories::CheckNonRhRepository.new,
+         Procedures::Packages::Install.new(:packages => [ForemanMaintain::Utils::Facter.package])]
       end
 
       confine do

data/definitions/features/apache.rb

@@ -0,0 +1,19 @@
+class Features::Apache < ForemanMaintain::Feature
+  metadata do
+    label :apache
+
+    confine do
+      find_package('httpd')
+    end
+  end
+
+  def services
+    [
+      system_service('httpd', 30)
+    ]
+  end
+
+  def config_files
+    ['/etc/httpd']
+  end
+end

data/definitions/features/capsule.rb

@@ -5,7 +5,8 @@ class Features::Capsule < ForemanMaintain::Feature
     label :capsule
 
     confine do
-      package_manager.installed?(['satellite-capsule']) ||
+      !package_manager.installed?(['satellite']) &&
+        package_manager.installed?(['satellite-capsule']) ||
         package_manager.installed?(['capsule-installer'])
     end
   end

data/definitions/features/dynflow_sidekiq.rb

@@ -13,7 +13,7 @@ class Features::DynflowSidekiq < ForemanMaintain::Feature
 
   def config_files
     # Workaround until foreman-installer can deploy scaled workers
-    service_symlinks = configured_services.map do |service|
+    service_symlinks = configured_instances.map do |service|
       "/etc/systemd/system/multi-user.target.wants/#{service}.service"
     end
     [

data/definitions/features/foreman_proxy.rb

@@ -12,6 +12,9 @@ class Features::ForemanProxy < ForemanMaintain::Feature
   FOREMAN_PROXY_DHCP_YML_PATHS = ['/etc/foreman-proxy/settings.d/dhcp.yml',
                                   '/usr/local/etc/foreman-proxy/settings.d/dhcp.yml'].freeze
 
+  FOREMAN_PROXY_TFTP_YML_PATHS = ['/etc/foreman-proxy/settings.d/tftp.yml',
+                                  '/usr/local/etc/foreman-proxy/settings.d/tftp.yml'].freeze
+
   def valid_dhcp_configs?
     dhcp_req_pass? && !syntax_error_exists?
   end
@@ -66,7 +69,7 @@ class Features::ForemanProxy < ForemanMaintain::Feature
 
     configs.push('/var/lib/tftpboot') if backup_features.include?('tftp')
     configs += ['/var/named/', '/etc/named*'] if backup_features.include?('dns')
-    if backup_features.include?('dhcp')
+    if backup_features.include?('dhcp') && dhcp_isc_provider?
       configs += ['/var/lib/dhcpd', File.dirname(dhcpd_config_file)]
     end
     configs.push('/usr/share/xml/scap') if backup_features.include?('openscap')
@@ -113,6 +116,10 @@ class Features::ForemanProxy < ForemanMaintain::Feature
     @dhcpd_config_file ||= lookup_dhcpd_config_file
   end
 
+  def tftp_root_directory
+    @tftp_root_directory ||= lookup_tftp_root_directory
+  end
+
   private
 
   def backup_features(for_features)
@@ -209,11 +216,22 @@ class Features::ForemanProxy < ForemanMaintain::Feature
     dhcpd_config_file
   end
 
-  def lookup_using_dhcp_yml
-    dhcp_yml_path = lookup_into(FOREMAN_PROXY_DHCP_YML_PATHS)
-    raise "Couldn't find dhcp.yml file under foreman-proxy" unless dhcp_yml_path
+  def dhcp_yml_path
+    dhcp_path = lookup_into(FOREMAN_PROXY_DHCP_YML_PATHS)
+    raise "Couldn't find dhcp.yml file under foreman-proxy" unless dhcp_path
+
+    dhcp_path
+  end
+
+  def configs_from_dhcp_yml
+    @configs_from_dhcp_yml ||= yaml_load(dhcp_yml_path)
+  end
+
+  def dhcp_isc_provider?
+    configs_from_dhcp_yml[:use_provider] == 'dhcp_isc'
+  end
 
-    configs_from_dhcp_yml = yaml_load(dhcp_yml_path)
+  def lookup_using_dhcp_yml
     if configs_from_dhcp_yml.key?(:dhcp_config)
       return configs_from_dhcp_yml[:dhcp_config]
     elsif configs_from_dhcp_yml.key?(:use_provider)
@@ -226,6 +244,13 @@ class Features::ForemanProxy < ForemanMaintain::Feature
     end
   end
 
+  def lookup_tftp_root_directory
+    tftp_yml_path = lookup_into(FOREMAN_PROXY_TFTP_YML_PATHS)
+    raise "Couldn't find tftp.yml file under foreman-proxy" unless tftp_yml_path
+
+    yaml_load(tftp_yml_path)[:tftproot]
+  end
+
   def yaml_load(path)
     YAML.load_file(path) || {}
   end

data/definitions/features/foreman_server.rb

@@ -9,9 +9,11 @@ module ForemanMaintain
       end
 
       def services
-        [
-          system_service('httpd', 30)
-        ]
+        if execute?('systemctl is-enabled foreman')
+          [system_service('foreman', 30, :socket => 'foreman')]
+        else
+          [system_service('httpd', 30)]
+        end
       end
 
       def plugins
@@ -26,7 +28,7 @@ module ForemanMaintain
       def config_files
         [
           '/etc/httpd',
-          '/var/www/html/pub',
+          '/var/www/html/pub/katello-*',
           '/etc/squid',
           '/etc/foreman',
           '/etc/selinux/targeted/contexts/files/file_contexts.subs',
@@ -41,6 +43,10 @@ module ForemanMaintain
           '/var/lib/foreman/public'
         ]
       end
+
+      def services_running?
+        services.all?(&:running?)
+      end
     end
   end
 end

data/definitions/features/puppet_server.rb

@@ -29,7 +29,7 @@ class Features::PuppetServer < ForemanMaintain::Feature
   end
 
   def puppet_version
-    version(execute!('puppet --version'))
+    version(execute!("#{puppet_path} --version"))
   end
 
   def find_empty_cacert_request_files
@@ -56,6 +56,10 @@ class Features::PuppetServer < ForemanMaintain::Feature
   end
 
   def puppet_ssldir_path
-    execute!('puppet master --configprint ssldir')
+    execute!("#{puppet_path} config print ssldir")
+  end
+
+  def puppet_path
+    '/opt/puppetlabs/bin/puppet'
   end
 end

data/definitions/features/service.rb

@@ -27,7 +27,7 @@ class Features::Service < ForemanMaintain::Feature
   end
 
   def filtered_services(options)
-    service_list = existing_services
+    service_list = include_unregistered_services(existing_services, options[:include])
     service_list = filter_services(service_list, options)
     raise 'No services found matching your parameters' unless service_list.any?
 
@@ -99,9 +99,14 @@ class Features::Service < ForemanMaintain::Feature
     %w[start stop restart status enable disable].include?(action)
   end
 
-  def filter_services(service_list, options)
-    service_list = include_unregistered_services(service_list, options[:include])
+  def extend_service_list_with_sockets(service_list, options)
+    return service_list unless options[:include_sockets]
+
+    socket_list = service_list.map(&:socket).compact.select(&:exist?)
+    service_list + socket_list
+  end
 
+  def filter_services(service_list, options)
     if options[:only] && options[:only].any?
       service_list = service_list.select do |service|
         options[:only].any? { |opt| service.matches?(opt) }
@@ -112,6 +117,8 @@ class Features::Service < ForemanMaintain::Feature
     if options[:exclude] && options[:exclude].any?
       service_list = service_list.reject { |service| options[:exclude].include?(service.name) }
     end
+
+    service_list = extend_service_list_with_sockets(service_list, options)
     service_list.sort
   end
 

data/definitions/procedures/backup/metadata.rb

@@ -6,6 +6,7 @@ module Procedures::Backup
       preparation_steps { Checks::Foreman::DBUp.new if feature(:foreman_server) }
       param :backup_dir, 'Directory where to backup to', :required => true
       param :incremental_dir, 'Changes since specified backup only'
+      param :online_backup, 'Select for online backup', :flag => true, :default => false
     end
 
     def run
@@ -16,6 +17,7 @@ module Procedures::Backup
         metadata['proxy_features'] = proxy_feature_list(spinner) || []
         metadata['rpms'] = rpms(spinner)
         metadata['incremental'] = @incremental_dir || false
+        metadata['online'] = @online_backup
         save_metadata(metadata, spinner)
       end
     end

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

@@ -12,7 +12,7 @@ module Procedures::Backup
         backup_lv = get_lv_info(@backup_dir)
 
         dbs = {}
-        dbs[:pulp] = 'Pulp' if feature(:pulp2) && !@skip_pulp
+        dbs[:pulp2] = 'Pulp' if feature(:pulp2) && !@skip_pulp
         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)

data/definitions/procedures/content/switchover.rb

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

data/definitions/procedures/hammer_setup.rb

@@ -5,7 +5,7 @@ class Procedures::HammerSetup < ForemanMaintain::Procedure
   end
 
   def run
-    if feature(:foreman_server) && ForemanMaintain::Utils.system_service('httpd', 30).running?
+    if feature(:foreman_server) && feature(:foreman_server).services_running?
       puts 'Configuring Hammer CLI...'
       result = feature(:hammer).setup_admin_access
       logger.info 'Hammer was configured successfully.' if result