foreman_maintain 0.8.1 → 0.8.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 4894231356aabd2a87f57c49952e1860f762908b98770e96d1b60118808927a1
-  data.tar.gz: 92dc7d469e6ac81bf6e7278225077c189d302157ee0d7c9e930ed53a2a5ad029
+  metadata.gz: e7e6e1bff90945614408bb1ae3e73b9a12fd43d75d7d164da74c9292e87f7d56
+  data.tar.gz: 8f7d7d509bd2e88738a9025bd53c2a09f21933a65c4d1ce617ade128a2473542
 SHA512:
-  metadata.gz: c3b440096f343c3ce67b2ee8a94a265eb53141d4c57f6bd9fb49562ba9f3bb8ba8a8886875917c88df7324e1993902b51a125ba02760ab9cfa1820e1d1d9b323
-  data.tar.gz: 17eb800a81f97ff503aa8fbe87c55918dcb99946928079eeab9288c93972a7f287e5acc4d699e8c5294c196bdabb2da978b363d79015ed6b796688c7c063a7a9
+  metadata.gz: 69b30ba9d0f4aa6bd74ac5ec609c8e6baaa26954aee7b50291c244dd90571546381ba7f929ec36466eae92a745e62f9ce5855a5f671c851b87a8cb5ecc69f82f
+  data.tar.gz: 76f1d2b051c4b062e1719303b0b87c450847702b4dd2c784f7afa31195886e46e6fe44a342fad9d3d3d130ac514dc4addbb9bdff32cd03fb75a165024cc9f295

data/definitions/checks/disk/available_space_postgresql12.rb

@@ -0,0 +1,45 @@
+module Checks
+  module Disk
+    class AvailableSpacePostgresql12 < ForemanMaintain::Check
+      metadata do
+        label :available_space_for_postgresql12
+        description 'Check to make sure PostgreSQL 12 work directory has enough space for upgrade'
+        confine do
+          (feature(:foreman_database) || feature(:candlepin_database)) && \
+            (file_exists?('/var/lib/pgsql') && \
+            file_exists?('/var/opt/rh/rh-postgresql12'))
+        end
+      end
+
+      def run
+        assert(psql_12_available_space >= psql_9_consumed_space, warning_message, :warn => true)
+      end
+
+      def pgsql_dir(version)
+        if version == 9
+          '/var/lib/pgsql/'
+        elsif version == 12
+          '/var/opt/rh/rh-postgresql12/'
+        end
+      end
+
+      def psql_9_consumed_space
+        io_obj = ForemanMaintain::Utils::Disk::IODevice.new(pgsql_dir(9))
+        io_obj.space_used
+      end
+
+      def psql_12_available_space
+        io_obj = ForemanMaintain::Utils::Disk::IODevice.new(pgsql_dir(12))
+        io_obj.available_space
+      end
+
+      def warning_message
+        sat_version = feature(:satellite).current_version.version[0..2]
+        "Satellite #{sat_version} uses PostgreSQL 12. \nThis changes PostgreSQL "\
+        "work directory to #{pgsql_dir(12)}\n"\
+        "The new work directory requires at least #{psql_9_consumed_space}"\
+        'MiB free space for upgrade!'
+      end
+    end
+  end
+end

data/definitions/checks/non_rh_packages.rb

@@ -11,7 +11,8 @@ class Checks::NonRhPackages < ForemanMaintain::Check
   def run
     rpm_query_format = '%{NAME}-%{VERSION}-%{RELEASE}.%{ARCH} : %{VENDOR}\n'
     all_packages = package_manager.list_installed_packages(rpm_query_format)
-    non_rh_packages = all_packages - all_packages.grep(Regexp.union(rh_regexp_list))
+    non_rh_packages = all_packages - \
+                      all_packages.grep(Regexp.union(rh_regexp_list + ansible_runner_regexp_list))
     assert(non_rh_packages.empty?, error_msg(non_rh_packages), :warn => true)
   end
 
@@ -26,4 +27,8 @@ class Checks::NonRhPackages < ForemanMaintain::Check
      /-qpid-router-server/, /java-client/, /pulp-client/, /katello-default-ca/, /katello-server-ca/,
      /katello-ca-consumer/, /gpg-pubkey/, /-tomcat/]
   end
+
+  def ansible_runner_regexp_list
+    [/ansible-runner/, /[python\d]+-ansible-runner/]
+  end
 end

data/definitions/checks/services_up.rb

@@ -6,7 +6,9 @@ class Checks::ServicesUp < ForemanMaintain::Check
   end
 
   def run
-    failed_services = feature(:service).existing_services.reject(&:running?)
+    all_services = feature(:service).existing_services
+    failed_services = feature(:service).filter_disabled_services!('status', all_services).
+                      reject(&:running?)
     restart_procedure = Procedures::Service::Restart.new(
       :only => failed_services,
       :wait_for_server_response => true

data/definitions/features/foreman_proxy.rb

@@ -28,10 +28,11 @@ class Features::ForemanProxy < ForemanMaintain::Feature
   end
 
   def services
-    [
-      system_service('smart_proxy_dynflow_core', 20),
-      system_service('foreman-proxy', 40)
-    ]
+    services = [system_service('foreman-proxy', 40)]
+    if check_max_version('foreman-proxy', '2.4')
+      services << system_service('smart_proxy_dynflow_core', 20)
+    end
+    services
   end
 
   def features

data/definitions/features/service.rb

@@ -43,6 +43,13 @@ class Features::Service < ForemanMaintain::Feature
     action_word_modified(action) + 'ed'
   end
 
+  def filter_disabled_services!(action, service_list)
+    if %w[start stop restart status].include?(action)
+      service_list.select!(&:enabled?)
+    end
+    service_list
+  end
+
   private
 
   def use_system_service(action, options, spinner)
@@ -135,13 +142,6 @@ class Features::Service < ForemanMaintain::Feature
   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
     return service_list unless services_filter.any?

data/definitions/procedures/pulp/remove.rb

@@ -22,26 +22,38 @@ module Procedures::Pulp
       ]
     end
 
+    # rubocop:disable  Metrics/MethodLength
     def pulp_packages
-      [
-        'pulp-server', 'python-pulp-streamer', 'pulp-puppet-plugins',
-        'python-pulp-rpm-common', 'python-pulp-common',
-        'pulp-selinux', 'python-pulp-oid_validation',
-        'python-pulp-puppet-common', 'python-pulp-repoauth',
-        'pulp-rpm-plugins', 'python-blinker', 'python-celery',
-        'python-django', 'python-isodate', 'python-ldap',
-        'python-mongoengine', 'python-nectar', 'python-oauth2',
-        'python-pymongo'
-      ]
+      possible = %w[pulp-admin-client pulp-agent pulp-consumer-client pulp-deb-admin-extensions
+                    pulp-deb-plugins pulp-docker-admin-extensions pulp-docker-plugins
+                    pulp-nodes-admin-extensions pulp-nodes-child pulp-nodes-common
+                    pulp-nodes-consumer-extensions pulp-nodes-parent pulp-ostree-admin-extensions
+                    pulp-ostree-plugins pulp-puppet-admin-extensions
+                    pulp-puppet-consumer-extensions pulp-puppet-handlers pulp-puppet-plugins
+                    pulp-puppet-tools pulp-python-admin-extensions pulp-python-plugins
+                    pulp-rpm-admin-extensions pulp-rpm-consumer-extensions pulp-rpm-handlers
+                    pulp-rpm-plugins pulp-rpm-yumplugins pulp-selinux pulp-server python-bson
+                    python-crane python-isodate python-mongoengine python-nectar
+                    python-pulp-agent-lib python-pulp-bindings python-pulp-client-lib
+                    python-pulp-common python-pulp-deb-common python-pulp-devel
+                    python-pulp-docker-common python-pulp-integrity python-pulp-manifest
+                    python-pulp-oid_validation python-pulp-ostree-common python-pulp-puppet-common
+                    python-pulp-python-common python-pulp-repoauth python-pulp-rpm-common
+                    python-pulp-streamer python-pymongo python-pymongo-gridfs python2-amqp
+                    python2-billiard python2-celery python2-debpkgr python2-django python2-kombu
+                    python2-solv python2-vine pulp-katello]
+
+      @installed_pulp_packages ||= possible.select { |pkg| find_package(pkg) }
+      @installed_pulp_packages
     end
 
     def data_dir_removal_cmds
-      pulp_data_dirs.collect { |dir| "rm -rf #{dir}" }
+      pulp_data_dirs.select { |dir| File.directory?(dir) }.map { |dir| "rm -rf #{dir}" }
     end
 
     def ask_to_proceed(rm_cmds)
       question = "\nWARNING: All pulp2 packages will be removed with the following commands:\n" \
-        "\n# yum remove #{pulp_packages.join('  ')}" \
+        "\n# rpm -e #{pulp_packages.join('  ')}" \
         "\n# yum remove rh-mongodb34-*" \
         "\n\nAll pulp2 data will be removed.\n"
       question += rm_cmds.collect { |cmd| "\n# #{cmd}" }.join
@@ -52,18 +64,18 @@ module Procedures::Pulp
 
     def run
       rm_cmds = data_dir_removal_cmds
-      ask_to_proceed(rm_cmds)
+      ask_to_proceed(rm_cmds) if rm_cmds.any?
 
       remove_pulp
 
       remove_mongo
 
-      delete_pulp_data(rm_cmds)
+      delete_pulp_data(rm_cmds) if rm_cmds.any?
     end
 
     def remove_pulp
       with_spinner('Removing pulp2 packages') do
-        packages_action(:remove, pulp_packages, :assumeyes => true)
+        execute!("rpm -e #{pulp_packages.join('  ')}")
       end
     end
 
@@ -76,9 +88,7 @@ module Procedures::Pulp
     def delete_pulp_data(rm_cmds)
       with_spinner('Deleting pulp2 data directories') do |spinner|
         rm_cmds.each do |cmd|
-          if File.directory?(cmd.split[2])
-            execute!(cmd)
-          end
+          execute!(cmd)
         end
         spinner.update('Done deleting pulp2 data directories')
       end

data/definitions/scenarios/upgrade_to_satellite_6_8.rb

@@ -28,6 +28,7 @@ module Scenarios::Satellite_6_8
       add_steps(find_checks(:default))
       add_steps(find_checks(:pre_upgrade))
       add_step(Checks::Foreman::CheckpointSegments)
+      add_step(Checks::Disk::AvailableSpacePostgresql12)
       add_step(Checks::Repositories::Validate.new(:version => '6.8'))
     end
   end

data/definitions/scenarios/upgrade_to_satellite_6_9.rb

@@ -28,6 +28,7 @@ module Scenarios::Satellite_6_9
       add_steps(find_checks(:default))
       add_steps(find_checks(:pre_upgrade))
       add_step(Checks::Foreman::CheckpointSegments)
+      add_step(Checks::Disk::AvailableSpacePostgresql12)
       add_step(Checks::Repositories::Validate.new(:version => '6.9'))
     end
   end

data/lib/foreman_maintain/concerns/base_database.rb

@@ -2,7 +2,7 @@ module ForemanMaintain
   module Concerns
     module BaseDatabase
       def data_dir
-        if check_min_version('foreman', '2.0')
+        if el7? && check_min_version('foreman', '2.0')
           '/var/opt/rh/rh-postgresql12/lib/pgsql/data/'
         else
           '/var/lib/pgsql/data/'

data/lib/foreman_maintain/concerns/downstream.rb

@@ -62,53 +62,51 @@ module ForemanMaintain
 
       def rh_repos(server_version)
         server_version = version(server_version)
-        rh_version_major = ForemanMaintain::Utils::Facter.os_major_release
-        rh_repos = main_rh_repos(rh_version_major)
-
+        rh_repos = main_rh_repos
         server_version_full = "#{server_version.major}.#{server_version.minor}"
-        rh_repos.concat(product_specific_repos(rh_version_major, server_version_full))
-
+        rh_repos.concat(product_specific_repos(server_version_full))
         if server_version > version('6.3')
-          rh_repos << ansible_repo(server_version, rh_version_major)
+          rh_repos << ansible_repo(server_version)
         end
 
         rh_repos
       end
 
-      def ansible_repo(server_version, rh_version_major)
+      def ansible_repo(server_version)
         if server_version >= version('6.8')
-          "rhel-#{rh_version_major}-server-ansible-2.9-rpms"
+          "rhel-#{el_major_version}-server-ansible-2.9-rpms"
         elsif server_version >= version('6.6')
-          "rhel-#{rh_version_major}-server-ansible-2.8-rpms"
+          "rhel-#{el_major_version}-server-ansible-2.8-rpms"
         elsif server_version >= version('6.4')
-          "rhel-#{rh_version_major}-server-ansible-2.6-rpms"
+          "rhel-#{el_major_version}-server-ansible-2.6-rpms"
         end
       end
 
-      # TODO: refactoring
-      def product_specific_repos(rh_version_major, full_version)
+      def product_specific_repos(full_version)
         repos = []
         repos << if ENV['FOREMAN_MAINTAIN_USE_BETA'] == '1'
-                   "rhel-server-#{rh_version_major}-#{package_name}-6-beta-rpms"
+                   "rhel-server-#{el_major_version}-#{package_name}-6-beta-rpms"
                  else
-                   "rhel-#{rh_version_major}-server-#{package_name}-#{full_version}-rpms"
+                   "rhel-#{el_major_version}-server-#{package_name}-#{full_version}-rpms"
                  end
+        repos << puppet4_repo(full_version) unless puppet4_repo(full_version).nil?
+        repos.concat(common_repos(full_version))
+      end
+
+      def puppet4_repo(full_version)
         if current_minor_version == '6.3' && full_version.to_s != '6.4' && (
           feature(:puppet_server) && feature(:puppet_server).puppet_version.major == 4)
-          # TODO: confirm repo for capsule. It might be same repo
-          repos << "rhel-#{rh_version_major}-server-satellite-tools-6.3-puppet4-rpms"
+          "rhel-#{el_major_version}-server-#{package_name}-tools-6.3-puppet4-rpms"
         end
-
-        repos.concat(common_repos(rh_version_major, full_version))
       end
 
-      def common_repos(rh_version_major, full_version)
+      def common_repos(full_version)
         repos_arrary = if ENV['FOREMAN_MAINTAIN_USE_BETA'] == '1'
-                         ["rhel-#{rh_version_major}-server-satellite-maintenance-6-beta-rpms",
-                          "rhel-#{rh_version_major}-server-satellite-tools-6-beta-rpms"]
+                         ["rhel-#{el_major_version}-server-satellite-maintenance-6-beta-rpms",
+                          "rhel-#{el_major_version}-server-satellite-tools-6-beta-rpms"]
                        else
-                         ["rhel-#{rh_version_major}-server-satellite-maintenance-6-rpms",
-                          "rhel-#{rh_version_major}-server-satellite-tools-#{full_version}-rpms"]
+                         ["rhel-#{el_major_version}-server-satellite-maintenance-6-rpms",
+                          "rhel-#{el_major_version}-server-satellite-tools-#{full_version}-rpms"]
                        end
 
         return repos_arrary.first(1) if feature(:satellite)
@@ -116,9 +114,9 @@ module ForemanMaintain
         repos_arrary
       end
 
-      def main_rh_repos(rh_version_major)
-        ["rhel-#{rh_version_major}-server-rpms",
-         "rhel-server-rhscl-#{rh_version_major}-rpms"]
+      def main_rh_repos
+        ["rhel-#{el_major_version}-server-rpms",
+         "rhel-server-rhscl-#{el_major_version}-rpms"]
       end
 
       def version_from_source

data/lib/foreman_maintain/concerns/system_helpers.rb

@@ -192,6 +192,31 @@ module ForemanMaintain
           yield current_version
         end
       end
+
+      def os_facts
+        facter = ForemanMaintain::Utils::Facter.path
+        @os_facts ||= JSON.parse(execute("#{facter} -j os"))
+      end
+
+      def el?
+        os_facts['os']['family'] == 'RedHat'
+      end
+
+      def debian?
+        os_facts['os']['family'] == 'Debian'
+      end
+
+      def el7?
+        os_facts['os']['release']['major'] = '7' && el?
+      end
+
+      def el8?
+        os_facts['os']['release']['major'] = '8' && el?
+      end
+
+      def el_major_version
+        return os_facts['os']['release']['major'] if el?
+      end
     end
   end
 end

data/lib/foreman_maintain/runner.rb

@@ -15,6 +15,7 @@ module ForemanMaintain
       @reporter = reporter
       @scenarios = Array(scenarios)
       @quit = false
+      @rescue = false
       @last_scenario = nil
       @last_scenario_continuation_confirmed = false
       @exit_code = 0
@@ -29,12 +30,17 @@ module ForemanMaintain
       @assumeyes
     end
 
+    def rescue?
+      @rescue
+    end
+
     def run
       @scenarios.each do |scenario|
         run_scenario(scenario)
         next unless @quit
 
         if @rescue_scenario
+          @rescue = true
           logger.debug('=== Rescue scenario found. Executing ===')
           execute_scenario_steps(@rescue_scenario, true)
         end
@@ -44,10 +50,10 @@ module ForemanMaintain
 
     def run_scenario(scenario)
       return if scenario.steps.empty?
-      raise 'The runner is already in quit state' if quit?
+      raise 'The runner is already in quit state' if quit? && !rescue?
 
       confirm_scenario(scenario)
-      return if quit?
+      return if quit? && !rescue?
 
       execute_scenario_steps(scenario)
     ensure

data/lib/foreman_maintain/utils/disk/io_device.rb

@@ -26,6 +26,10 @@ module ForemanMaintain
           execute!("df #{dir}|awk {'print $5'}|tail -1").to_i
         end
 
+        def space_used
+          convert_kb_to_mb(execute!("du -ks #{dir} | awk {'print $1'}").to_i)
+        end
+
         private
 
         # In fio command, --direct option bypass the cache page

data/lib/foreman_maintain/utils/facter.rb

@@ -13,9 +13,5 @@ module ForemanMaintain::Utils
     def self.path
       FACTER_FILES.find { |path| File.exist?(path) }
     end
-
-    def self.os_major_release
-      execute!("#{path} operatingsystemmajrelease")
-    end
   end
 end

data/lib/foreman_maintain/version.rb

@@ -1,3 +1,3 @@
 module ForemanMaintain
-  VERSION = '0.8.1'.freeze
+  VERSION = '0.8.2'.freeze
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: foreman_maintain
 version: !ruby/object:Gem::Version
-  version: 0.8.1
+  version: 0.8.2
 platform: ruby
 authors:
 - Ivan Nečas
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2021-05-10 00:00:00.000000000 Z
+date: 2021-06-16 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: clamp
@@ -126,6 +126,7 @@ files:
 - definitions/checks/check_tmout.rb
 - definitions/checks/disk/available_space.rb
 - definitions/checks/disk/available_space_candlepin.rb
+- definitions/checks/disk/available_space_postgresql12.rb
 - definitions/checks/disk/performance.rb
 - definitions/checks/env_proxy.rb
 - definitions/checks/foreman/check_checkpoint_segments.rb