foreman_maintain 1.0.2 → 1.0.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 65892e9e2d93db0e9b4793b00743b75474ce7900cb425abe85e006cf7b6190ad
-  data.tar.gz: ee0ddd71d2dbb04805e080c60bff8a4b943122d6dd0e4c96b14401cf731fe7bf
+  metadata.gz: '092ba2224bd80eeef29cbcc522cf6ef3a438094125e8a4ad87e0c99281fdd251'
+  data.tar.gz: 0f71a35dc5325391b51a9648cd633ccf681eae203dfa9b49e6626e2b1bd6b602
 SHA512:
-  metadata.gz: df314cd4b969b7e9a71dfc3255ee6bd54ce598a42b26596ec499b866385b0838f8c455a4adc5e74acafbfd7cc733c63f072ada1d2d2af5b5473f8ba329ab77a2
-  data.tar.gz: 41f7380430eb839081e4fa70610b0ef87b733d08acfaa3573a8a4750d2e4880e650a91e415c4a04e4be9c28e828dd4e2c9d9245839a4891c50690247c62697a5
+  metadata.gz: 5589f427186e871ca4b0fbaba47ac450962ef2a91f72c33209b2b9f67d1c354e84c9f407cb47b686ef9867a82cbfdbc6360c1e312ba41021bc16fa08fa5e7e0c
+  data.tar.gz: 6f2f77e8fe631dee53dd3e9476868d76063d8f1c4fb4b2533c332ca88ab16af0b587901258fe4ab7558bf9fce942263b5717c7ef2717a7c0ea428de266a36991

data/definitions/checks/check_hotfix_installed.rb

@@ -46,9 +46,11 @@ 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|
+    query_format = '%{ui_from_repo} %{name}-%{evr}.%{arch}'
+    IO.popen([repoquery_cmd, '-a', '--installed', '--qf', query_format]) do |io|
       io.each do |line|
         repo, pkg = line.chomp.split
+        next if repo.nil? || pkg.nil?
         packages << pkg if /satellite|rhscl/ =~ repo[1..-1].downcase
       end
     end

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/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/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/lib/foreman_maintain/version.rb

@@ -1,3 +1,3 @@
 module ForemanMaintain
-  VERSION = '1.0.2'.freeze
+  VERSION = '1.0.3'.freeze
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: foreman_maintain
 version: !ruby/object:Gem::Version
-  version: 1.0.2
+  version: 1.0.3
 platform: ruby
 authors:
 - Ivan Nečas
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2022-01-26 00:00:00.000000000 Z
+date: 2022-02-09 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: clamp