foreman_maintain 1.0.1 → 1.0.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: e70bdc300a891fd04cb9e489737a0a96a46d83977f192eddc1ee14a8deff7b9b
-  data.tar.gz: ac5dc055fc90930f91c844f7c7bd411d156c943d911b56d9df5aafab4262481a
+  metadata.gz: 65892e9e2d93db0e9b4793b00743b75474ce7900cb425abe85e006cf7b6190ad
+  data.tar.gz: ee0ddd71d2dbb04805e080c60bff8a4b943122d6dd0e4c96b14401cf731fe7bf
 SHA512:
-  metadata.gz: ce61614ae7a224595e48ef2cf4a8e0f268e3a7f1f59b8bc67af8ea19c7926ee6fe2d1f6474a8a13fb758627e7c2aa87d272163a064298c208a97e6e3279978da
-  data.tar.gz: 983efdf31d1fdfc9dedca4c66374d178ef34310da40900e60af7f85550627d0416f88713316c93551f66c75bc775d7a533524b38b1e28e603944c6edf3d8bb6d
+  metadata.gz: df314cd4b969b7e9a71dfc3255ee6bd54ce598a42b26596ec499b866385b0838f8c455a4adc5e74acafbfd7cc733c63f072ada1d2d2af5b5473f8ba329ab77a2
+  data.tar.gz: 41f7380430eb839081e4fa70610b0ef87b733d08acfaa3573a8a4750d2e4880e650a91e415c4a04e4be9c28e828dd4e2c9d9245839a4891c50690247c62697a5

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/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/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,7 +1,7 @@
 module Procedures::Repositories
   class Enable < ForemanMaintain::Procedure
     metadata do
-      param :repos, 'List of repositories to enable'
+      param :repos, 'Array of repositories to enable'
       description 'Enable repositories'
     end
     def run

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.2'.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.2
 platform: ruby
 authors:
 - Ivan Nečas
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2021-12-13 00:00:00.000000000 Z
+date: 2022-01-26 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: clamp