foreman_maintain 1.0.12 → 1.1.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 40bec791581fb8e2670586e331afd5e89ba1ca436b38d95e848837fc8ce1fdd3
-  data.tar.gz: 54f35bb8139e221173ca57786c93e36559957116577907fa936d0ff3f4256858
+  metadata.gz: 38a7ae9f24c88731e052acb62c13b25d29074a07ad852daa258bed6322c1d22d
+  data.tar.gz: e0420aa7dc1935c61ef479aed3a43069281797ca41f131048902c727676c6634
 SHA512:
-  metadata.gz: 2e00f5941e44f62e5fa09d47924fa231af050cf32ae555a775bdb247753c0b38d1a2b3c554e86d3699287f1a4367a461f780be6fca5c897031feffbf07de9f53
-  data.tar.gz: 80447d1b43a06edcdd7d9846637c4f484f8bd454e9bdda303355223f64671fa276e37e1c0c8bf50aff1c6213ed30d23028c850b31e1e9f3463b1660994109902
+  metadata.gz: e0b38e2d2819e152a508874b060b22f161aa4b56523d9b6869b714f9186920fa7d61fd10b09840158c94e4b55a7c18a718307e9a02f4320426f54baa9bdfdd9f
+  data.tar.gz: d53fb1934cdc2cbbc2cad92e43a4132ff0f8ea8eec1435bd930be575d3e2284a48278809b7576bdf24b8d7df36ac39fe2dcb223813dc9f8c3b57632e08e030e5

data/definitions/features/capsule.rb

@@ -12,7 +12,7 @@ class Features::Capsule < ForemanMaintain::Feature
   end
 
   def current_version
-    @current_version ||= rpm_version(package_name)
+    @current_version ||= package_version(package_name)
   end
 
   def package_name

data/definitions/features/installer.rb

@@ -64,9 +64,7 @@ class Features::Installer < ForemanMaintain::Feature
   def config_files
     Dir.glob(File.join(config_directory, '**/*')) +
       [
-        '/usr/local/bin/validate_postgresql_connection.sh',
-        '/opt/puppetlabs/puppet/cache/foreman_cache_data',
-        '/opt/puppetlabs/puppet/cache/pulpcore_cache_data'
+        '/usr/local/bin/validate_postgresql_connection.sh'
       ]
   end
 
@@ -102,7 +100,13 @@ class Features::Installer < ForemanMaintain::Feature
   end
 
   def installer_arguments
-    installer_args = ' --disable-system-checks'
+    installer_args = ''
+
+    if feature(:foreman_proxy) &&
+       feature(:foreman_proxy).with_content?
+      installer_args += ' --disable-system-checks'
+    end
+
     unless check_min_version('foreman', '2.1') || check_min_version('foreman-proxy', '2.1')
       installer_args += ' --upgrade' if can_upgrade?
     end

data/definitions/features/katello.rb

@@ -12,7 +12,7 @@ class Features::Katello < ForemanMaintain::Feature
   end
 
   def current_version
-    @current_version ||= rpm_version('katello')
+    @current_version ||= package_version('katello')
   end
 
   def services

data/definitions/features/nftables.rb

@@ -25,14 +25,12 @@ class Features::Nftables < ForemanMaintain::Feature
     execute!("nft add chain #{family} #{table} #{chain} #{chain_options}")
   end
 
-  def add_rules(options = {})
+  def add_rule(options = {})
     family = options.fetch(:family, ip_family)
     table = options.fetch(:table, table_name)
     chain = options.fetch(:chain, chain_name)
-    rules = options.fetch(:rules) # needs validation
-    rules.each do |rule|
-      execute!("nft add rule #{family} #{table} #{chain} #{rule}")
-    end
+    rule = options.fetch(:rule) # needs validation
+    execute!("nft add rule #{family} #{table} #{chain} #{rule}")
   end
 
   def table_exist?(name = table_name)

data/definitions/features/puppet_server.rb

@@ -11,6 +11,8 @@ class Features::PuppetServer < ForemanMaintain::Feature
     [
       '/etc/puppet',
       '/etc/puppetlabs',
+      '/opt/puppetlabs/puppet/cache/foreman_cache_data',
+      '/var/lib/puppet/foreman_cache_data',
       '/opt/puppetlabs/puppet/ssl/',
       '/var/lib/puppet/ssl',
       '/var/lib/puppet',

data/definitions/features/satellite.rb

@@ -10,7 +10,7 @@ class Features::Satellite < ForemanMaintain::Feature
   end
 
   def current_version
-    @current_version ||= rpm_version(package_name) || version_from_source
+    @current_version ||= package_version(package_name) || version_from_source
   end
 
   def package_name

data/definitions/procedures/content/prepare.rb

@@ -4,7 +4,6 @@ module Procedures::Content
       description 'Prepare content for Pulp 3'
       for_feature :pulpcore
       param :quiet, 'Keep the output on a single line', :flag => true, :default => false
-      do_not_whitelist
     end
 
     def run

data/definitions/procedures/content/switchover.rb

@@ -9,7 +9,6 @@ module Procedures::Content
       end
 
       param :skip_deb, 'Do not run debian options in installer.'
-      do_not_whitelist
     end
 
     def run

data/definitions/procedures/foreman/apipie_cache.rb

@@ -6,7 +6,7 @@ module Procedures::Foreman
     end
 
     def run
-      execute!('FOREMAN_APIPIE_LANGS=en foreman-rake apipie:cache')
+      execute!('foreman-rake apipie:cache')
     end
   end
 end

data/definitions/procedures/pulp/remove.rb

@@ -24,7 +24,15 @@ module Procedures::Pulp
         '/var/lib/pulp/uploads',
         '/var/lib/mongodb/',
         '/var/cache/pulp'
-      ]
+      ].select { |dir| File.directory?(dir) }
+    end
+
+    def pulp_data_dirs_mountpoints
+      pulp_data_dirs.select { |d| Pathname(d).mountpoint? }
+    end
+
+    def deletable_pulp_dirs
+      @deletable_pulp_dirs ||= pulp_data_dirs - pulp_data_dirs_mountpoints
     end
 
     # rubocop:disable  Metrics/MethodLength
@@ -53,11 +61,12 @@ module Procedures::Pulp
       @installed_pulp_packages
     end
 
-    def data_dir_removal_cmds
-      pulp_data_dirs.select { |dir| File.directory?(dir) }.map { |dir| "rm -rf #{dir}" }
+    def data_dir_removal_cmds(pulp_dirs)
+      pulp_dirs.map { |dir| "rm -rf #{dir}" }
     end
 
-    def ask_to_proceed(rm_cmds)
+    def ask_to_proceed
+      rm_cmds = data_dir_removal_cmds(pulp_data_dirs)
       question = "\nWARNING: All pulp2 packages will be removed with the following commands:\n"
       question += "\n# rpm -e #{pulp_packages.join('  ')}" if pulp_packages.any?
       question += "\n# yum remove rh-mongodb34-*"
@@ -70,11 +79,9 @@ module Procedures::Pulp
     end
 
     def run
-      rm_cmds = data_dir_removal_cmds
-
       assumeyes_val = @assumeyes.nil? ? assumeyes? : @assumeyes
 
-      ask_to_proceed(rm_cmds) unless assumeyes_val
+      ask_to_proceed unless assumeyes_val
 
       remove_pulp if pulp_packages.any?
 
@@ -86,7 +93,7 @@ module Procedures::Pulp
 
       drop_migrations
 
-      delete_pulp_data(rm_cmds) if rm_cmds.any?
+      delete_pulp_data
 
       restart_pulpcore_services
     end
@@ -163,12 +170,41 @@ module Procedures::Pulp
     end
     # rubocop:enable Metrics/BlockLength
 
-    def delete_pulp_data(rm_cmds)
-      with_spinner('Deleting pulp2 data directories') do |spinner|
-        rm_cmds.each do |cmd|
-          execute!(cmd)
+    def delete_pulp_data
+      non_mountpoints = data_dir_removal_cmds(deletable_pulp_dirs)
+      mountpoints = pulp_data_dirs_mountpoints
+      with_spinner('') do |spinner|
+        if non_mountpoints.any?
+          spinner.update('Deleting pulp2 data directories.')
+          non_mountpoints.each do |cmd|
+            execute!(cmd)
+          end
+          msg_for_del_non_mountpoints(mountpoints, spinner)
+        end
+        if mountpoints.any?
+          msg_for_del_mountpoints(mountpoints, spinner)
         end
-        spinner.update('Done deleting pulp2 data directories')
+      end
+    end
+
+    def msg_for_del_non_mountpoints(mountpoints, spinner)
+      if mountpoints.empty?
+        spinner.update('Done deleting all pulp2 data directories.')
+      else
+        spinner.update("Deleted: #{deletable_pulp_dirs.join("\n")}")
+      end
+    end
+
+    def msg_for_del_mountpoints(mountpoints, spinner)
+      _, cmd_name = ForemanMaintain.pkg_and_cmd_name
+      if mountpoints.count > 1
+        spinner.update("The directories #{mountpoints.join(',')} are individual mountpoints.")
+        puts  "\nThe #{cmd_name} won't delete these directories.\n"\
+              'You need to remove content and these directories on your own.'
+      else
+        spinner.update("The directory #{mountpoints.join(',')} is individual mountpoint.")
+        puts  "\nThe #{cmd_name} won't delete the directory.\n"\
+              'You need to remove content and the directory on your own.'
       end
     end
 

data/definitions/scenarios/puppet.rb

@@ -15,9 +15,6 @@ module ForemanMaintain::Scenarios
           add_step(Procedures::Puppet::RemovePuppet)
           add_step(Procedures::Puppet::RemovePuppetData) if context.get(:remove_data)
           add_step(Procedures::Service::Restart)
-          if server?
-            add_step(Procedures::Foreman::ApipieCache)
-          end
         end
       end
     end

data/definitions/scenarios/self_upgrade.rb

@@ -1,6 +1,5 @@
 module ForemanMaintain::Scenarios
   class SelfUpgradeBase < ForemanMaintain::Scenario
-    include ForemanMaintain::Concerns::Downstream
     def enabled_system_repos_id
       repository_manager.enabled_repos.keys
     end
@@ -68,10 +67,7 @@ module ForemanMaintain::Scenarios
 
     def repos_ids_to_reenable
       repos_ids_to_reenable = stored_enabled_repos_ids - all_maintenance_repos
-      if use_rhsm?
-        repos_ids_to_reenable << maintenance_repo(maintenance_repo_version)
-      end
-      repos_ids_to_reenable
+      repos_ids_to_reenable << maintenance_repo(maintenance_repo_version)
     end
 
     def use_rhsm?
@@ -83,10 +79,6 @@ module ForemanMaintain::Scenarios
 
       true
     end
-
-    def req_repos_to_update_pkgs
-      main_rh_repos + [maintenance_repo_id(target_version)]
-    end
   end
 
   class SelfUpgrade < SelfUpgradeBase
@@ -102,10 +94,9 @@ module ForemanMaintain::Scenarios
         pkgs_to_update = %w[satellite-maintain rubygem-foreman_maintain]
         add_step(Procedures::Repositories::BackupEnabledRepos.new)
         disable_repos
-        add_step(Procedures::Repositories::Enable.new(repos: req_repos_to_update_pkgs,
+        add_step(Procedures::Repositories::Enable.new(repos: [maintenance_repo_id(target_version)],
                                                       use_rhsm: use_rhsm?))
         add_step(Procedures::Packages::Update.new(packages: pkgs_to_update, assumeyes: true))
-        disable_repos('*')
         enable_repos(repos_ids_to_reenable)
       end
     end
@@ -122,7 +113,6 @@ module ForemanMaintain::Scenarios
 
     def compose
       if check_min_version('foreman', '2.5') || check_min_version('foreman-proxy', '2.5')
-        disable_repos('*')
         enable_repos(repos_ids_to_reenable)
       end
     end

data/definitions/scenarios/upgrade_to_satellite_6_11.rb

@@ -61,7 +61,7 @@ module Scenarios::Satellite_6_11
       add_step(Procedures::Repositories::Setup.new(:version => '6.11'))
       add_step(Procedures::Packages::UnlockVersions.new)
       add_step(Procedures::Packages::Update.new(:assumeyes => true))
-      add_step_with_context(Procedures::Installer::RunFor6_11)
+      add_step_with_context(Procedures::Installer::Upgrade)
       add_step(Procedures::Installer::UpgradeRakeTask)
     end
   end

data/lib/foreman_maintain/concerns/firewall/nftables_maintenance_mode.rb

@@ -10,7 +10,7 @@ module ForemanMaintain
           unless table_exist?
             add_table
             add_chain(:chain_options => nftables_chain_options)
-            add_rules(rules: nftables_rules)
+            add_rule(rule: nftables_rule)
           end
         end
 
@@ -22,8 +22,8 @@ module ForemanMaintain
           '{type filter hook input priority 0\\;}'
         end
 
-        def nftables_rules
-          ['iifname "lo" accept', 'tcp dport 443 reject']
+        def nftables_rule
+          'tcp dport https reject'
         end
 
         def status_for_maintenance_mode

data/lib/foreman_maintain/concerns/metadata.rb

@@ -100,10 +100,6 @@ module ForemanMaintain
           @data[:advanced_run] = advanced_run
         end
 
-        def do_not_whitelist
-          @data[:do_not_whitelist] = true
-        end
-
         def self.eval_dsl(metadata, &block)
           new(metadata).tap do |dsl|
             dsl.instance_eval(&block)

data/lib/foreman_maintain/concerns/system_helpers.rb

@@ -115,7 +115,8 @@ module ForemanMaintain
 
       def package_version(name)
         # space for extension to support non-rpm distributions
-        rpm_version(name)
+        pkg = package_manager.find_installed_package(name, '%{VERSION}')
+        version(pkg) unless pkg.nil?
       end
 
       def parse_csv(data)
@@ -132,13 +133,6 @@ module ForemanMaintain
         nil
       end
 
-      def rpm_version(name)
-        rpm_version = execute(%(rpm -q '#{name}' --queryformat="%{VERSION}"))
-        if $CHILD_STATUS.success?
-          version(rpm_version)
-        end
-      end
-
       def shellescape(string)
         Shellwords.escape(string)
       end

data/lib/foreman_maintain/package_manager/yum.rb

@@ -36,8 +36,12 @@ module ForemanMaintain::PackageManager
       sys.execute?(%(rpm -q #{packages_list}))
     end
 
-    def find_installed_package(name)
-      status, result = sys.execute_with_status(%(rpm -q '#{name}'))
+    def find_installed_package(name, queryformat = '')
+      rpm_cmd = "rpm -q '#{name}'"
+      unless queryformat.empty?
+        rpm_cmd += " --qf '#{queryformat}'"
+      end
+      status, result = sys.execute_with_status(rpm_cmd)
       if status == 0
         result
       end
@@ -78,12 +82,12 @@ module ForemanMaintain::PackageManager
       sys.execute(find_cmd).split("\n")
     end
 
-    def list_installed_packages(queryfm = '%{NAME}-%{VERSION}-%{RELEASE}.%{ARCH}\n')
-      # The queryfm should only include valid tag(s) as per `rpm --querytag` list.
+    def list_installed_packages(queryformat = '%{NAME}-%{VERSION}-%{RELEASE}.%{ARCH}\n')
+      # The queryformat should only include valid tag(s) as per `rpm --querytags` list.
       # If any special formatting is required with querytag then it should be provided with tag i.e,
-      # querytag = "--%{VENDOR}"
-      # The queryfm string must end with '\n'
-      sys.execute!("rpm -qa --qf '#{queryfm}'").split("\n")
+      # "--%{VENDOR}"
+      # The queryformat string must end with '\n'
+      sys.execute!("rpm -qa --qf '#{queryformat}'").split("\n")
     end
 
     private

data/lib/foreman_maintain/reporter/cli_reporter.rb

@@ -317,11 +317,7 @@ module ForemanMaintain
 
         steps_with_error = scenario.steps_with_error(:whitelisted => false)
         steps_with_skipped = scenario.steps_with_skipped(:whitelisted => true)
-        not_skippable_steps = scenario.steps_with_error.select do |step|
-          step.metadata[:do_not_whitelist] == true
-        end
-
-        steps_to_whitelist = steps_with_error + steps_with_skipped - not_skippable_steps
+        steps_to_whitelist = steps_with_error + steps_with_skipped
         unless steps_with_error.empty?
           message << format(<<-MESSAGE.strip_heredoc, format_steps(steps_with_error, "\n", 2))
           The following steps ended up in failing state:
@@ -329,25 +325,11 @@ module ForemanMaintain
           %s
           MESSAGE
           whitelist_labels = steps_to_whitelist.map(&:label_dashed).join(',')
-          unless whitelist_labels.empty?
-            recommend << if scenario.detector.feature(:instance).downstream
-                           format(<<-MESSAGE.strip_heredoc, whitelist_labels)
-              Resolve the failed steps and rerun the command.
-
-              If the situation persists and, you are unclear what to do next,
-              contact Red Hat Technical Support.
-
-              In case the failures are false positives, use
-              --whitelist="%s"
-              MESSAGE
-                         else
-                           format(<<-MESSAGE.strip_heredoc, whitelist_labels)
-              Resolve the failed steps and rerun the command.
-              In case the failures are false positives, use
-              --whitelist="%s"
-              MESSAGE
-                         end
-          end
+          recommend << format(<<-MESSAGE.strip_heredoc, whitelist_labels)
+          Resolve the failed steps and rerun
+          the command. In case the failures are false positives,
+          use --whitelist="%s"
+          MESSAGE
         end
 
         steps_with_warning = scenario.steps_with_warning(:whitelisted => false)

data/lib/foreman_maintain/utils/service/systemd.rb

@@ -8,21 +8,16 @@ module ForemanMaintain::Utils
         @instance_parent_unit = options.fetch(:instance_parent_unit, nil)
       end
 
-      def command(action, options = {})
-        do_wait = options.fetch(:wait, true) # wait for service to start
+      def command(action)
         all = @options.fetch(:all, false)
         skip_enablement = @options.fetch(:skip_enablement, false)
         if skip_enablement && %w[enable disable].include?(action)
           return skip_enablement_message(action, @name)
         end
 
-        if do_wait && File.exist?('/usr/sbin/service-wait')
-          "service-wait #{@name} #{action}"
-        else
-          cmd = "systemctl #{action} #{@name}"
-          cmd += ' --all' if all
-          cmd
-        end
+        cmd = "systemctl #{action} #{@name}"
+        cmd += ' --all' if all
+        cmd
       end
 
       def status
@@ -38,11 +33,11 @@ module ForemanMaintain::Utils
       end
 
       def enable
-        execute('enable', :wait => false)
+        execute('enable')
       end
 
       def disable
-        execute('disable', :wait => false)
+        execute('disable')
       end
 
       def running?
@@ -66,8 +61,8 @@ module ForemanMaintain::Utils
 
       private
 
-      def execute(action, options = {})
-        @sys.execute_with_status(command(action, options))
+      def execute(action)
+        @sys.execute_with_status(command(action))
       end
 
       def service_enabled_status

data/lib/foreman_maintain/version.rb

@@ -1,3 +1,3 @@
 module ForemanMaintain
-  VERSION = '1.0.12'.freeze
+  VERSION = '1.1.1'.freeze
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: foreman_maintain
 version: !ruby/object:Gem::Version
-  version: 1.0.12
+  version: 1.1.1
 platform: ruby
 authors:
 - Ivan Nečas
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2022-06-08 00:00:00.000000000 Z
+date: 2022-04-26 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: clamp
@@ -266,7 +266,6 @@ files:
 - definitions/procedures/foreman_tasks/ui_investigate.rb
 - definitions/procedures/hammer_setup.rb
 - definitions/procedures/installer/run.rb
-- definitions/procedures/installer/run_for_6_11.rb
 - definitions/procedures/installer/upgrade.rb
 - definitions/procedures/installer/upgrade_rake_task.rb
 - definitions/procedures/knowledge_base_article.rb

data/definitions/procedures/installer/run_for_6_11.rb

@@ -1,52 +0,0 @@
-module Procedures::Installer
-  class RunFor6_11 < ForemanMaintain::Procedure
-    metadata do
-      description 'Run installer with Candlepin SSL CA'\
-                  ' when using external database with SSL'
-      param :assumeyes, 'Do not ask for confirmation'
-      manual_detection
-    end
-
-    def run
-      if extdb_and_ssl?
-        run_installer_with_extra_option
-      else
-        run_installer
-      end
-    end
-
-    def ext_db?
-      !feature(:foreman_database).local?
-    end
-
-    def installer_answers
-      @installer_answers ||= feature(:installer).answers
-    end
-
-    def server_db_with_ssl?
-      installer_answers.fetch('katello')['candlepin_db_ssl']
-    end
-
-    def extdb_and_ssl?
-      ext_db? && server_db_with_ssl?
-    end
-
-    def run_installer_with_extra_option
-      ssl_ca_path = installer_answers.fetch('foreman')['db_root_cert']
-      spinner_msg = "Running installer with --katello-candlepin-db-ssl-ca #{ssl_ca_path} argument!"
-      with_spinner(spinner_msg) do
-        installer_args = feature(:installer).installer_arguments
-        new_ssl_arg = " --katello-candlepin-db-ssl-ca #{ssl_ca_path}"
-        installer_args << new_ssl_arg
-        feature(:installer).run(installer_args)
-      end
-    end
-
-    def run_installer
-      with_spinner('Executing installer') do
-        assumeyes_val = @assumeyes.nil? ? assumeyes? : @assumeyes
-        feature(:installer).upgrade(:interactive => !assumeyes_val)
-      end
-    end
-  end
-end