foreman_maintain 1.0.0 → 1.0.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: bc78f39bf65ff7aa89be6ba1dda201de03f6d9a4b637599e5afd3d489ac4495d
-  data.tar.gz: 5554b12a68af2a4710ef7725d39079fbe7452b280b40b9ebfe0bd23cad058f40
+  metadata.gz: e70bdc300a891fd04cb9e489737a0a96a46d83977f192eddc1ee14a8deff7b9b
+  data.tar.gz: ac5dc055fc90930f91c844f7c7bd411d156c943d911b56d9df5aafab4262481a
 SHA512:
-  metadata.gz: d68910821f5bcbdc2267d7fa5201fe348b4f32af27531d15a621567aaef88dc52bfdc17e3fcaf6ec70899514c103d501b785edd2cb6c9100bb50762b7050236e
-  data.tar.gz: bede7c7b5521c991a83ca714fbdc10bee1df94d992daa4d54c142a51717bfae130f2e5ddf4b789f5c34274a0eb766fed0d62b0bd1f09017c14c0a9378402307c
+  metadata.gz: ce61614ae7a224595e48ef2cf4a8e0f268e3a7f1f59b8bc67af8ea19c7926ee6fe2d1f6474a8a13fb758627e7c2aa87d272163a064298c208a97e6e3279978da
+  data.tar.gz: 983efdf31d1fdfc9dedca4c66374d178ef34310da40900e60af7f85550627d0416f88713316c93551f66c75bc775d7a533524b38b1e28e603944c6edf3d8bb6d

data/definitions/checks/foreman_proxy/check_tftp_storage.rb

@@ -44,7 +44,9 @@ module Checks::ForemanProxy
     def self.lookup_token_duration
       data = feature(:foreman_database). \
              query("select s.value, s.default from settings s \
-                    where category = 'Setting::Provisioning' and name = 'token_duration'")
+                    where category IN ('Setting::Provisioning','Setting') \
+                    and name = 'token_duration'")
+
       YAML.load(data[0]['value'] || data[0]['default'])
     end
   end

data/definitions/checks/repositories/check_non_rh_repository.rb

@@ -11,13 +11,18 @@ module Checks::Repositories
 
     def run
       with_spinner('Checking repositories enabled on the system') do
-        assert(!epel_enabled?, 'System is subscribed to non Red Hat repositories')
+        assert(epel_not_enabled?, 'System is subscribed to non Red Hat repositories')
       end
     end
 
-    def epel_enabled?
-      system_repos = execute("yum repolist enabled -d 6 -e 0| grep -E 'Repo-baseurl|Repo-id'")
-      system_repos.to_s.match(/\bepel\b/i)
+    def epel_not_enabled?
+      system_repos = repository_manager.enabled_repos
+      system_repos.each do |repoid, repourl|
+        unless repoid.match(/\bepel\b/i).nil? || repourl.match(/\bepel\b/i).nil?
+          return false
+        end
+      end
+      true
     end
   end
 end

data/definitions/checks/repositories/check_upstream_repository.rb

@@ -14,10 +14,10 @@ class Checks::CheckUpstreamRepository < ForemanMaintain::Check
 
   def run
     with_spinner('Checking for presence of upstream repositories') do
-      enabled_upstream_repos = feature(:system_repos).upstream_repos_ids
-      assert(enabled_upstream_repos.empty?,
-             "System has upstream #{enabled_upstream_repos.join(',')} repositories enabled",
-             :next_steps => Procedures::Repositories::Disable.new(:repos => enabled_upstream_repos))
+      enabled_repo_ids = feature(:upstream_repositories).repoids_and_urls.keys
+      assert(enabled_repo_ids.empty?,
+             "System has upstream #{enabled_repo_ids.join(',')} repositories enabled",
+             :next_steps => Procedures::Repositories::Disable.new(:repos => enabled_repo_ids))
     end
   end
 end

data/definitions/features/upstream_repositories.rb

@@ -0,0 +1,23 @@
+class Features::UpstreamRepositories < ForemanMaintain::Feature
+  metadata do
+    label :upstream_repositories
+    description 'Feature for operations on upstream repositories'
+  end
+
+  def repoids_and_urls
+    repoids_and_urls = {}
+    repository_manager.enabled_repos.each do |repo, url|
+      repo_urls.each do |regex|
+        repoids_and_urls[repo] = url if url =~ regex
+      end
+    end
+    repoids_and_urls
+  end
+
+  private
+
+  def repo_urls
+    [%r{yum.theforeman.org\/*},
+     %r{yum.puppetlabs.com\/*}]
+  end
+end

data/definitions/procedures/pulp/remove.rb

@@ -86,6 +86,8 @@ module Procedures::Pulp
       drop_migrations
 
       delete_pulp_data(rm_cmds) if rm_cmds.any?
+
+      restart_pulpcore_services
     end
 
     def remove_pulp
@@ -168,5 +170,15 @@ module Procedures::Pulp
         spinner.update('Done deleting pulp2 data directories')
       end
     end
+
+    def restart_pulpcore_services
+      with_spinner('Restarting pulpcore services') do |spinner|
+        pulp_services = feature(:pulpcore).services
+
+        feature(:service).handle_services(spinner, 'stop', :only => pulp_services)
+        feature(:service).handle_services(spinner, 'start', :only => pulp_services)
+        spinner.update('Done restarting pulpcore services')
+      end
+    end
   end
 end

data/definitions/procedures/repositories/backup_enabled_repos.rb

@@ -6,7 +6,7 @@ module Procedures::Repositories
     end
 
     def run
-      enabled_repos_ids = feature(:system_repos).enabled_repos_ids
+      enabled_repos_ids = repository_manager.enabled_repos.keys
       unless enabled_repos_ids.empty?
         backup_dir = File.expand_path(ForemanMaintain.config.backup_dir)
         File.write(File.join(backup_dir, 'enabled_repos.yml'), enabled_repos_ids.to_yaml)

data/definitions/procedures/repositories/disable.rb

@@ -6,7 +6,7 @@ module Procedures::Repositories
     end
     def run
       with_spinner('Disabling repositories') do
-        feature(:system_repos).disable_repos(@repos)
+        repository_manager.disable_repos(@repos)
       end
     end
   end

data/definitions/procedures/repositories/enable.rb

@@ -6,7 +6,7 @@ module Procedures::Repositories
     end
     def run
       with_spinner('Enabling repositories') do
-        feature(:system_repos).enable_repos(@repos)
+        repository_manager.enable_repos(@repos)
       end
     end
   end

data/definitions/scenarios/self_upgrade.rb

@@ -1,7 +1,7 @@
 module ForemanMaintain::Scenarios
   class SelfUpgradeBase < ForemanMaintain::Scenario
     def enabled_system_repos_id
-      feature(:system_repos).enabled_repos_ids
+      repository_manager.enabled_repos.keys
     end
 
     def enable_repos(repo_ids = stored_enabled_repos_ids)

data/lib/foreman_maintain/concerns/downstream.rb

@@ -17,6 +17,10 @@ module ForemanMaintain
         current_version.to_s[/^\d+\.\d+/]
       end
 
+      def repository_manager
+        ForemanMaintain.repository_manager
+      end
+
       # TODO: Modify activation_key changes as per server
       def setup_repositories(version)
         activation_key = ENV['EXTERNAL_SAT_ACTIVATION_KEY']
@@ -26,18 +30,14 @@ module ForemanMaintain
           execute!(%(subscription-manager register #{org_options}\
                       --activationkey #{shellescape(activation_key)} --force))
         else
-          execute!(%(subscription-manager repos --disable '*'))
-          enable_options = rh_repos(version).map { |r| "--enable=#{r}" }.join(' ')
-          execute!(%(subscription-manager repos #{enable_options}))
+          repository_manager.rhsm_disable_repos('*')
+          repository_manager.rhsm_enable_repos(rh_repos(version))
         end
       end
 
       def absent_repos(version)
-        all_repo_lines = execute(%(LANG=en_US.utf-8 subscription-manager repos --list 2>&1 | ) +
-                                  %(grep '^Repo ID:')).split("\n")
-        all_repos = all_repo_lines.map { |line| line.split(/\s+/).last }
         repos_required = rh_repos(version)
-        repos_found = repos_required & all_repos
+        repos_found = repos_required & repository_manager.rhsm_list_repos.keys
         repos_required - repos_found
       end
 

data/lib/foreman_maintain/concerns/system_helpers.rb

@@ -185,6 +185,10 @@ module ForemanMaintain
         ForemanMaintain.package_manager
       end
 
+      def repository_manager
+        ForemanMaintain.repository_manager
+      end
+
       def ruby_prefix(scl = true)
         if debian?
           'ruby-'

data/lib/foreman_maintain/repository_manager/el.rb

@@ -0,0 +1,85 @@
+module ForemanMaintain::RepositoryManager
+  class El
+    include ForemanMaintain::Concerns::OsFacts
+    include ForemanMaintain::Concerns::SystemHelpers
+
+    def disable_repos(repo_ids)
+      if el7?
+        execute!("yum-config-manager #{config_manager_options(repo_ids, 'disable')}")
+      else
+        execute!("dnf config-manager #{config_manager_options(repo_ids, 'set-disabled')}")
+      end
+    end
+
+    def rhsm_disable_repos(repo_ids)
+      if rhsm_available?
+        execute!(%(subscription-manager repos #{rhsm_options(repo_ids, 'disable')}))
+      else
+        logger.info("subscription-manager is not available.\
+                     Using #{pkg_manager} config manager instead.")
+        disable_repos(repo_ids)
+      end
+    end
+
+    def enable_repos(repo_ids)
+      if el7?
+        execute!("yum-config-manager #{config_manager_options(repo_ids, 'enable')}")
+      else
+        execute!("dnf config-manager #{config_manager_options(repo_ids, 'enable')}")
+      end
+    end
+
+    def rhsm_enable_repos(repo_ids)
+      if rhsm_available?
+        execute!(%(subscription-manager repos #{rhsm_options(repo_ids, 'enable')}))
+      else
+        logger.info("subscription-manager is not available.\
+                     Using #{pkg_manager} config manager instead.")
+        enable_repos(repo_ids)
+      end
+    end
+
+    def rhsm_options(repo_ids, options)
+      repo_ids.map { |r| "--#{options}=#{r}" }.join(' ')
+    end
+
+    def config_manager_options(repo_ids, options)
+      repo_ids_string = if repo_ids.is_a?(Array)
+                          repo_ids.join(',')
+                        else
+                          repo_ids
+                        end
+      format_shell_args("--#{options}" => repo_ids_string)
+    end
+
+    def rhsm_available?
+      @rhsm_available ||= find_package('subscription-manager')
+    end
+
+    def rhsm_list_repos(list_option = '--list')
+      repos = execute(%(LANG=en_US.utf-8 subscription-manager repos #{list_option} 2>&1))
+      return {} if repos.empty?
+
+      hash_of_repoids_urls(repos, /Repo ID|Repo URL/)
+    end
+
+    def pkg_manager
+      package_manager.class.name.split('::').last.downcase
+    end
+
+    def enabled_repos
+      cmd = "#{pkg_manager} repolist enabled -d 6 -e 0 2> /dev/null"
+      repos = execute(cmd)
+      return {} if repos.empty?
+
+      hash_of_repoids_urls(repos, /Repo-id|Repo-baseurl/)
+    end
+
+    def hash_of_repoids_urls(repos, regex)
+      Hash[*repos.split("\n").grep(regex).map do |entry|
+             entry.split(':', 2).last.strip
+           end
+      ]
+    end
+  end
+end

data/lib/foreman_maintain/repository_manager.rb

@@ -0,0 +1,13 @@
+require 'foreman_maintain/repository_manager/el'
+include ForemanMaintain::Concerns::OsFacts
+module ForemanMaintain
+  def self.repository_manager
+    @repository_manager ||= if el?
+                              ForemanMaintain::RepositoryManager::El.new
+                            elsif debian?
+                              raise 'Not implemented!'
+                            else
+                              raise 'No supported repository manager was found'
+                            end
+  end
+end

data/lib/foreman_maintain/version.rb

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

data/lib/foreman_maintain.rb

@@ -40,6 +40,7 @@ module ForemanMaintain
   require 'foreman_maintain/upgrade_runner'
   require 'foreman_maintain/reporter'
   require 'foreman_maintain/package_manager'
+  require 'foreman_maintain/repository_manager'
   require 'foreman_maintain/utils'
   require 'foreman_maintain/error'
 

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: foreman_maintain
 version: !ruby/object:Gem::Version
-  version: 1.0.0
+  version: 1.0.1
 platform: ruby
 authors:
 - Ivan Nečas
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2021-12-03 00:00:00.000000000 Z
+date: 2021-12-13 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: clamp
@@ -214,9 +214,9 @@ files:
 - definitions/features/satellite.rb
 - definitions/features/service.rb
 - definitions/features/sync_plans.rb
-- definitions/features/system_repos.rb
 - definitions/features/tar.rb
 - definitions/features/upstream.rb
+- definitions/features/upstream_repositories.rb
 - definitions/procedures/backup/accessibility_confirmation.rb
 - definitions/procedures/backup/clean.rb
 - definitions/procedures/backup/compress_data.rb
@@ -416,6 +416,8 @@ files:
 - lib/foreman_maintain/procedure.rb
 - lib/foreman_maintain/reporter.rb
 - lib/foreman_maintain/reporter/cli_reporter.rb
+- lib/foreman_maintain/repository_manager.rb
+- lib/foreman_maintain/repository_manager/el.rb
 - lib/foreman_maintain/runner.rb
 - lib/foreman_maintain/runner/execution.rb
 - lib/foreman_maintain/runner/stored_execution.rb

data/definitions/features/system_repos.rb

@@ -1,58 +0,0 @@
-class Features::SystemRepos < ForemanMaintain::Feature
-  metadata do
-    label :system_repos
-    description 'Feature for operations on yum repositories of system'
-  end
-
-  def upstream_repos
-    repositories = {}
-    enabled_repos_hash.each do |repo, url|
-      upstream_repo_urls.each do |regex|
-        repositories[repo] = url if url =~ regex
-      end
-    end
-    repositories
-  end
-
-  def enabled_repos_hash
-    repos = execute("yum repolist enabled -d 6 -e 0 2> /dev/null | grep -E 'Repo-id|Repo-baseurl'")
-    return {} if repos.empty?
-
-    Hash[*repos.delete!(' ').split("\n")]
-  end
-
-  def enabled_repos_ids
-    trim_repoids(enabled_repos_hash.keys)
-  end
-
-  def upstream_repos_ids
-    trim_repoids(upstream_repos.keys)
-  end
-
-  def disable_repos(repo_ids)
-    execute!("yum-config-manager --disable #{repo_ids.join(',')}")
-  end
-
-  def enable_repos(repo_ids)
-    execute!("yum-config-manager --enable #{repo_ids.join(',')}")
-  end
-
-  private
-
-  def trim_repoids(repos)
-    repos.map { |r| r.gsub(%r{Repo-id:|\/+\w*}, '') }
-  end
-
-  def upstream_repo_urls
-    repo_urls = { :Foreman => %r{yum.theforeman.org\/},
-                  :Katello => %r{fedorapeople.org\/groups\/katello\/releases\/yum\/[\/|\w|.]*} }
-    [/#{repo_urls[:Foreman]}+releases/,
-     /#{repo_urls[:Foreman]}+plugins/,
-     /#{repo_urls[:Katello]}+katello/,
-     /#{repo_urls[:Katello]}+client/,
-     /#{repo_urls[:Katello]}+candlepin/,
-     /#{repo_urls[:Katello]}+pulp/,
-     %r{yum.puppetlabs.com\/el\/[\w|\/|\.]*\/x86_64},
-     %r{repos.fedorapeople.org\/repos\/pulp\/[\/|\w|.]*\/x86_64}]
-  end
-end