foreman_maintain 1.0.1 → 1.0.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: e70bdc300a891fd04cb9e489737a0a96a46d83977f192eddc1ee14a8deff7b9b
-  data.tar.gz: ac5dc055fc90930f91c844f7c7bd411d156c943d911b56d9df5aafab4262481a
+  metadata.gz: eee1f58199b0dd709acdfd9095292306de60d75d067edac09d28287caf323439
+  data.tar.gz: bd0b37c9668e6db36895a5a13b1568ea2cd171feacb670d5f5c912b9a7e7e7b6
 SHA512:
-  metadata.gz: ce61614ae7a224595e48ef2cf4a8e0f268e3a7f1f59b8bc67af8ea19c7926ee6fe2d1f6474a8a13fb758627e7c2aa87d272163a064298c208a97e6e3279978da
-  data.tar.gz: 983efdf31d1fdfc9dedca4c66374d178ef34310da40900e60af7f85550627d0416f88713316c93551f66c75bc775d7a533524b38b1e28e603944c6edf3d8bb6d
+  metadata.gz: 8c4117234bfaf93217d80f8f076b0187c59bb240fd3f8210867c41422d47c3a033d31c2eb2be61252303fe371ce1ab1c33d6f362576ed5a411d5c4c989b58c45
+  data.tar.gz: 97a10cdf47b6838eef3b7d79bc91849bc7d3f991e090f16d7a6a013b377b3a09e46c5ccd23de64f1520c080f7d1d56397468beb0bffe0a4d901e10c327356488

data/definitions/checks/check_hotfix_installed.rb

@@ -45,16 +45,24 @@ class Checks::CheckHotfixInstalled < ForemanMaintain::Check
 
   def installed_packages
     packages = []
-    repoquery_cmd = execute!('which repoquery')
-    IO.popen([repoquery_cmd, '-a', '--installed', '--qf', '%{ui_from_repo} %{nvra}']) do |io|
+    IO.popen(['repoquery', '-a', '--installed', '--qf', query_format]) do |io|
       io.each do |line|
         repo, pkg = line.chomp.split
-        packages << pkg if /satellite|rhscl/ =~ repo[1..-1].downcase
+        next if repo.nil? || pkg.nil?
+        packages << pkg if /satellite|rhscl/ =~ repo.downcase
       end
     end
     packages
   end
 
+  def query_format
+    if el7?
+      return '%{ui_from_repo} %{name}-%{evr}.%{arch}'
+    end
+
+    '%{from_repo} %{name}-%{evr}.%{arch}'
+  end
+
   def find_hotfix_packages
     output = execute!('rpm -qa release="*HOTFIX*"').strip
     return [] if output.empty?

data/definitions/checks/foreman_proxy/check_tftp_storage.rb

@@ -6,12 +6,12 @@ module Checks::ForemanProxy
       tags :default
       confine do
         feature(:satellite) && feature(:foreman_proxy) &&
-          feature(:foreman_proxy).features.include?('tftp') && non_zero_token_duration?
+          feature(:foreman_proxy).features.include?('tftp')
       end
     end
 
     def run
-      if Dir.exist?(tftp_boot_directory)
+      if non_zero_token_duration? && Dir.exist?(tftp_boot_directory)
         files = old_files_from_tftp_boot
         assert(files.empty?,
                'There are old initrd and vmlinuz files present in tftp',
@@ -29,7 +29,7 @@ module Checks::ForemanProxy
       end.compact
     end
 
-    def self.non_zero_token_duration?
+    def non_zero_token_duration?
       lookup_token_duration != 0
     end
 
@@ -38,10 +38,10 @@ module Checks::ForemanProxy
     end
 
     def token_duration
-      @token_duration ||= self.class.lookup_token_duration
+      @token_duration ||= lookup_token_duration
     end
 
-    def self.lookup_token_duration
+    def lookup_token_duration
       data = feature(:foreman_database). \
              query("select s.value, s.default from settings s \
                     where category IN ('Setting::Provisioning','Setting') \

data/definitions/checks/pulpcore/group_ownership_check.rb

@@ -2,13 +2,13 @@ module Checks
   module Pulpcore
     class GroupOwnershipCheck < ForemanMaintain::Check
       metadata do
-        description 'Check the group owner of /var/lib/pulp directory'
+        description 'Check the group owner of /var/lib/pulp/content directory'
         label :group_ownership_check_of_pulp_content
         manual_detection
       end
 
       def run
-        group_id = File.stat('/var/lib/pulp/').gid
+        group_id = File.stat('/var/lib/pulp/content/').gid
         if Etc.getgrgid(group_id).name != 'pulp'
           fail! "Please run 'foreman-maintain prep-6.10-upgrade' prior to upgrading."
         end

data/definitions/features/instance.rb

@@ -142,11 +142,15 @@ class Features::Instance < ForemanMaintain::Feature
   def component_features_map
     {
       '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],
-      'foreman_tasks' => %w[foreman_tasks]
+      'pulp3_content' => %w[pulpcore pulpcore_database],
+      'foreman_tasks' => %w[foreman_tasks],
+      'katello_agent' => %w[katello],
+      'katello_events' => %w[katello]
     }
   end
 
@@ -154,7 +158,7 @@ class Features::Instance < ForemanMaintain::Feature
     components = Array(components)
     cf_map = component_features_map
     # map ping components to features
-    features = components.map { |component| cf_map[component] }.flatten.uniq
+    features = components.map { |component| cf_map[component] }.flatten.uniq.compact
     # map features to existing services
     services_of_features = features.map do |name|
       feature(name.to_sym) ? feature(name.to_sym).services : []

data/definitions/procedures/puppet/remove_puppet.rb

@@ -10,15 +10,23 @@ module Procedures::Puppet
     end
 
     def run
-      services = feature(:foreman_server).services + feature(:dynflow_sidekiq).services
-      Procedures::Service::Stop.new(:only => services)
-      execute!('foreman-rake db:migrate VERSION=0 SCOPE=foreman_puppet') if server_with_puppet?
+      stop_applicable_services
+      if server_with_puppet? && feature(:foreman_server)
+        execute!('foreman-rake db:migrate VERSION=0 SCOPE=foreman_puppet')
+      end
       feature(:installer).run(installer_arguments_disabling_puppet.join(' '), :interactive => false)
       packages_action(:remove, packages_to_remove, :assumeyes => true)
     end
 
     private
 
+    def stop_applicable_services
+      services = []
+      services = feature(:foreman_server).services if feature(:foreman_server)
+      services << feature(:dynflow_sidekiq).services if feature(:dynflow_sidekiq)
+      Procedures::Service::Stop.new(:only => services) unless services.empty?
+    end
+
     def server_with_puppet?
       find_package(foreman_plugin_name('foreman_puppet'))
     end

data/definitions/procedures/puppet/remove_puppet_data.rb

@@ -5,7 +5,9 @@ module Procedures::Puppet
     end
 
     def run
-      execute!('foreman-rake purge:puppet')
+      if feature(:foreman_server)
+        execute!('foreman-rake purge:puppet')
+      end
       execute!('rm -r ' + files_to_purge.join(' '))
     end
 

data/definitions/procedures/repositories/disable.rb

@@ -1,7 +1,7 @@
 module Procedures::Repositories
   class Disable < ForemanMaintain::Procedure
     metadata do
-      param :repos, 'List of repositories to disable'
+      param :repos, 'Array of repositories to disable'
       description 'Disable repositories'
     end
     def run

data/definitions/procedures/repositories/enable.rb

@@ -1,12 +1,18 @@
 module Procedures::Repositories
   class Enable < ForemanMaintain::Procedure
     metadata do
-      param :repos, 'List of repositories to enable'
+      param :repos, 'Array of repositories to enable'
+      param :use_rhsm, 'Use RHSM to enable repository',
+            :flag => true, :default => false
       description 'Enable repositories'
     end
     def run
       with_spinner('Enabling repositories') do
-        repository_manager.enable_repos(@repos)
+        if @use_rhsm
+          repository_manager.rhsm_enable_repos(@repos)
+        else
+          repository_manager.enable_repos(@repos)
+        end
       end
     end
   end

data/definitions/scenarios/puppet.rb

@@ -14,6 +14,7 @@ module ForemanMaintain::Scenarios
           add_step(Checks::CheckPuppetCapsules) if server?
           add_step(Procedures::Puppet::RemovePuppet)
           add_step(Procedures::Puppet::RemovePuppetData) if context.get(:remove_data)
+          add_step(Procedures::Service::Restart)
         end
       end
     end

data/definitions/scenarios/self_upgrade.rb

@@ -62,13 +62,21 @@ module ForemanMaintain::Scenarios
       repos_ids_to_reenable = stored_enabled_repos_ids - all_maintenance_repos
       repos_ids_to_reenable << maintenance_repo(maintenance_repo_version)
     end
+
+    def use_rhsm?
+      if (repo = ENV['maintenance_repo'])
+        return false unless repo.empty?
+      end
+
+      true
+    end
   end
 
   class SelfUpgrade < SelfUpgradeBase
     metadata do
       label :self_upgrade_foreman_maintain
-      description "Enables the specified version's maintenance repository and, "\
-  								'updates the foreman-maintain packages'
+      description "Enables the specified version's maintenance repository and,"\
+  								"\nupdates the satellite-maintain packages"
       manual_detection
     end
 
@@ -77,7 +85,8 @@ 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: [maintenance_repo_id(target_version)]))
+        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))
         enable_repos(repos_ids_to_reenable)
       end
@@ -87,8 +96,8 @@ module ForemanMaintain::Scenarios
   class SelfUpgradeRescue < SelfUpgradeBase
     metadata do
       label :rescue_self_upgrade
-      description 'Disables all version specific maintenance repos and,'\
-  		' enables the repositories which were configured prior to self upgrade'
+      description 'Disables all version specific maintenance repositories and,'\
+  		 "\nenables the repositories which were configured prior to self upgrade"
       manual_detection
       run_strategy :fail_slow
     end

data/definitions/scenarios/upgrade_to_satellite_7_0.rb

@@ -41,6 +41,7 @@ module Scenarios::Satellite_7_0
 
     def compose
       add_steps(find_procedures(:pre_migrations))
+      add_step(Procedures::Pulp::Remove.new(:assumeyes => true))
       add_step(Procedures::Service::Stop.new)
     end
   end

data/lib/foreman_maintain/cli/self_upgrade_command.rb

@@ -29,7 +29,8 @@ module ForemanMaintain
         end
         if current_downstream_version >= next_version
           message = "The target-version #{target_version} should be "\
-                    "greater than existing version #{current_downstream_version}!"
+                    "greater than existing version #{current_downstream_version},"\
+                    "\nand self-upgrade should be used for major version upgrades only!"
           raise Error::UsageError, message
         end
       end

data/lib/foreman_maintain/concerns/downstream.rb

@@ -30,7 +30,7 @@ module ForemanMaintain
           execute!(%(subscription-manager register #{org_options}\
                       --activationkey #{shellescape(activation_key)} --force))
         else
-          repository_manager.rhsm_disable_repos('*')
+          repository_manager.rhsm_disable_repos(['*'])
           repository_manager.rhsm_enable_repos(rh_repos(version))
         end
       end

data/lib/foreman_maintain/version.rb

@@ -1,3 +1,3 @@
 module ForemanMaintain
-  VERSION = '1.0.1'.freeze
+  VERSION = '1.0.4'.freeze
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: foreman_maintain
 version: !ruby/object:Gem::Version
-  version: 1.0.1
+  version: 1.0.4
 platform: ruby
 authors:
 - Ivan Nečas
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2021-12-13 00:00:00.000000000 Z
+date: 2022-03-09 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: clamp