foreman_maintain 0.6.3 → 0.6.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: ee3a3147fb6baeb783edbdcdfb4b595d50fbc6f7540c95f0f1d673bd87a53cf1
-  data.tar.gz: 3586008b3cc66eb7733113144c0004cd9ce1553fe1b9d8f84e5126f5ddc2cadb
+  metadata.gz: e51a96d2df37cf98881bc81a1b67f33dca283ea34b226f2f434273984e6baa59
+  data.tar.gz: ad6c47b27ba7e5c2869354c0a60885e8da2158cc3b6feb04df614ccc78c395d5
 SHA512:
-  metadata.gz: e5df43e8cd8514d5489351ace62f2c37ff3558316faf2a9b475f4bd8eb5b624175dbb589ffef216df01feea18cb6a4592466afc8b32ccaca344c0280fafe99fb
-  data.tar.gz: 3c03b1e96a98c2d5800d69633c0584e8cd5632c1c663039a556e8bb63cd8cf45623a57c325266c9e3323d740424c683f6d29d5b53dbd23465a5fb7de56ec7d32
+  metadata.gz: ddd22571061620757eaa7d814c34c7c4d06801361ebba1296b5089a345ed61ac91c41fbaa97f643bb8535bf5644d5e96065dccbd66681d6b3516963462f1d940
+  data.tar.gz: 9f0023b28042b0f5145a7c2b60b91a8194216eeaa5936987cb91504c49a502a9dfd03c21d3d527cc7487a14a7abe2d8513dcc66a7f47454fa9f3bdc61debdb85

data/definitions/checks/check_hotfix_installed.rb

@@ -4,7 +4,8 @@ class Checks::CheckHotfixInstalled < ForemanMaintain::Check
     description 'Check to verify if any hotfix installed on system'
     tags :pre_upgrade
     preparation_steps do
-      Procedures::Packages::Install.new(:packages => %w[yum-utils])
+      [Checks::Repositories::CheckNonRhRepository.new,
+       Procedures::Packages::Install.new(:packages => %w[yum-utils])]
     end
 
     confine do

data/definitions/checks/disk/performance.rb

@@ -3,8 +3,15 @@ module Checks
     class Performance < ForemanMaintain::Check
       metadata do
         label :disk_performance
-        tags :pre_upgrade
-        preparation_steps { Procedures::Packages::Install.new(:packages => %w[fio]) }
+        preparation_steps do
+          if feature(:instance).downstream
+            [Checks::Repositories::CheckNonRhRepository.new,
+             Procedures::Packages::Install.new(:packages => %w[fio])]
+          else
+            [Procedures::Packages::Install.new(:packages => %w[fio])]
+          end
+        end
+
         confine do
           feature(:instance).pulp
         end

data/definitions/checks/repositories/check_non_rh_repository.rb

@@ -0,0 +1,23 @@
+module Checks::Repositories
+  class CheckNonRhRepository < ForemanMaintain::Check
+    metadata do
+      label :check_non_redhat_repository
+      description "Check whether system don't have any non Red Hat repositories(Eg: EPEL) enabled"
+      tags :pre_upgrade
+      confine do
+        feature(:instance).downstream
+      end
+    end
+
+    def run
+      with_spinner('Checking repositories enabled on the system') do
+        assert(!epel_enabled?, 'System is subscribed to non Red Hat repositories(Eg: EPEL)')
+      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)
+    end
+  end
+end

data/definitions/checks/repositories/check_upstream_repository.rb

@@ -4,7 +4,8 @@ class Checks::CheckUpstreamRepository < ForemanMaintain::Check
     description 'Check if any upstream repositories are enabled on system'
     tags :pre_upgrade
     preparation_steps do
-      Procedures::Packages::Install.new(:packages => %w[yum-utils])
+      [Checks::Repositories::CheckNonRhRepository.new,
+       Procedures::Packages::Install.new(:packages => %w[yum-utils])]
     end
     confine do
       feature(:instance).downstream

data/definitions/checks/repositories/validate.rb

@@ -3,7 +3,8 @@ module Checks::Repositories
     metadata do
       description 'Validate availability of repositories'
       preparation_steps do
-        Procedures::Packages::Install.new(:packages => [ForemanMaintain::Utils::Facter.package])
+        [Checks::Repositories::CheckNonRhRepository.new,
+         Procedures::Packages::Install.new(:packages => [ForemanMaintain::Utils::Facter.package])]
       end
 
       confine do

data/definitions/features/apache.rb

@@ -0,0 +1,19 @@
+class Features::Apache < ForemanMaintain::Feature
+  metadata do
+    label :apache
+
+    confine do
+      find_package('httpd')
+    end
+  end
+
+  def services
+    [
+      system_service('httpd', 30)
+    ]
+  end
+
+  def config_files
+    ['/etc/httpd']
+  end
+end

data/definitions/features/dynflow_sidekiq.rb

@@ -13,7 +13,7 @@ class Features::DynflowSidekiq < ForemanMaintain::Feature
 
   def config_files
     # Workaround until foreman-installer can deploy scaled workers
-    service_symlinks = configured_services.map do |service|
+    service_symlinks = configured_instances.map do |service|
       "/etc/systemd/system/multi-user.target.wants/#{service}.service"
     end
     [

data/definitions/features/foreman_server.rb

@@ -9,9 +9,11 @@ module ForemanMaintain
       end
 
       def services
-        [
-          system_service('httpd', 30)
-        ]
+        if execute?('systemctl is-enabled foreman')
+          [system_service('foreman', 30, :socket => 'foreman')]
+        else
+          [system_service('httpd', 30)]
+        end
       end
 
       def plugins
@@ -41,6 +43,10 @@ module ForemanMaintain
           '/var/lib/foreman/public'
         ]
       end
+
+      def services_running?
+        services.all?(&:running?)
+      end
     end
   end
 end

data/definitions/features/puppet_server.rb

@@ -29,7 +29,7 @@ class Features::PuppetServer < ForemanMaintain::Feature
   end
 
   def puppet_version
-    version(execute!('puppet --version'))
+    version(execute!("#{puppet_path} --version"))
   end
 
   def find_empty_cacert_request_files
@@ -56,6 +56,10 @@ class Features::PuppetServer < ForemanMaintain::Feature
   end
 
   def puppet_ssldir_path
-    execute!('puppet master --configprint ssldir')
+    execute!("#{puppet_path} config print ssldir")
+  end
+
+  def puppet_path
+    '/opt/puppetlabs/bin/puppet'
   end
 end

data/definitions/features/service.rb

@@ -27,7 +27,7 @@ class Features::Service < ForemanMaintain::Feature
   end
 
   def filtered_services(options)
-    service_list = existing_services
+    service_list = include_unregistered_services(existing_services, options[:include])
     service_list = filter_services(service_list, options)
     raise 'No services found matching your parameters' unless service_list.any?
 
@@ -99,9 +99,14 @@ class Features::Service < ForemanMaintain::Feature
     %w[start stop restart status enable disable].include?(action)
   end
 
-  def filter_services(service_list, options)
-    service_list = include_unregistered_services(service_list, options[:include])
+  def extend_service_list_with_sockets(service_list, options)
+    return service_list unless options[:include_sockets]
+
+    socket_list = service_list.map(&:socket).compact.select(&:exist?)
+    service_list + socket_list
+  end
 
+  def filter_services(service_list, options)
     if options[:only] && options[:only].any?
       service_list = service_list.select do |service|
         options[:only].any? { |opt| service.matches?(opt) }
@@ -112,6 +117,8 @@ class Features::Service < ForemanMaintain::Feature
     if options[:exclude] && options[:exclude].any?
       service_list = service_list.reject { |service| options[:exclude].include?(service.name) }
     end
+
+    service_list = extend_service_list_with_sockets(service_list, options)
     service_list.sort
   end
 

data/definitions/procedures/hammer_setup.rb

@@ -5,7 +5,7 @@ class Procedures::HammerSetup < ForemanMaintain::Procedure
   end
 
   def run
-    if feature(:foreman_server) && ForemanMaintain::Utils.system_service('httpd', 30).running?
+    if feature(:foreman_server) && feature(:foreman_server).services_running?
       puts 'Configuring Hammer CLI...'
       result = feature(:hammer).setup_admin_access
       logger.info 'Hammer was configured successfully.' if result

data/definitions/procedures/installer/run.rb

@@ -2,10 +2,12 @@ module Procedures::Installer
   class Run < ForemanMaintain::Procedure
     metadata do
       param :arguments, 'Arguments passed to installer'
+      param :assumeyes, 'Do not ask for confirmation'
     end
 
     def run
-      feature(:installer).run(@arguments, :interactive => true)
+      assumeyes_val = @assumeyes.nil? ? assumeyes? : @assumeyes
+      feature(:installer).run(@arguments, :interactive => !assumeyes_val)
     end
 
     def description

data/definitions/procedures/installer/upgrade.rb

@@ -1,7 +1,12 @@
 module Procedures::Installer
   class Upgrade < ForemanMaintain::Procedure
+    metadata do
+      param :assumeyes, 'Do not ask for confirmation'
+    end
+
     def run
-      feature(:installer).upgrade(:interactive => true)
+      assumeyes_val = @assumeyes.nil? ? assumeyes? : @assumeyes
+      feature(:installer).run(@arguments, :interactive => !assumeyes_val)
     end
   end
 end

data/definitions/procedures/packages/update.rb

@@ -10,7 +10,7 @@ module Procedures::Packages
 
     def run
       assumeyes_val = @assumeyes.nil? ? assumeyes? : @assumeyes
-      package_manager.clean_cache
+      package_manager.clean_cache(:assumeyes => assumeyes_val)
       packages_action(:update, @packages, :assumeyes => assumeyes_val)
     rescue ForemanMaintain::Error::ExecutionError => e
       if @warn_on_errors

data/definitions/procedures/service/stop.rb

@@ -8,7 +8,7 @@ module Procedures::Service
     end
 
     def run
-      run_service_action('stop', common_options)
+      run_service_action('stop', common_options.merge(:include_sockets => true))
     end
   end
 end

data/definitions/scenarios/packages.rb

@@ -1,5 +1,16 @@
 module ForemanMaintain::Scenarios
   module Packages
+    def self.skip_installer_run?(packages_list)
+      packages_list = packages_list.split(',').map(&:strip) if packages_list.is_a?(String)
+
+      return false unless packages_list.any? { |p| p.include?('foreman_maintain') }
+      return true if packages_list.length == 1
+
+      fm_pkg = ForemanMaintain.main_package_name
+      puts "ERROR: install or update '#{fm_pkg}' package individually."
+      exit 1
+    end
+
     class Status < ForemanMaintain::Scenario
       metadata do
         label :packages_status
@@ -45,12 +56,17 @@ module ForemanMaintain::Scenarios
       end
 
       def compose
-        add_step_with_context(Procedures::Packages::InstallerConfirmation)
-        add_step_with_context(Procedures::Packages::UnlockVersions)
-        add_step_with_context(Procedures::Packages::Install,
-                              :force => true, :warn_on_errors => true)
-        add_step_with_context(Procedures::Installer::Upgrade)
-        add_step(Procedures::Packages::LockingStatus)
+        if Packages.skip_installer_run?(context.get(:packages))
+          add_step_with_context(Procedures::Packages::Install,
+                                :force => true, :warn_on_errors => true)
+        else
+          add_step_with_context(Procedures::Packages::InstallerConfirmation)
+          add_step_with_context(Procedures::Packages::UnlockVersions)
+          add_step_with_context(Procedures::Packages::Install,
+                                :force => true, :warn_on_errors => true)
+          add_step_with_context(Procedures::Installer::Upgrade)
+          add_step(Procedures::Packages::LockingStatus)
+        end
       end
 
       def set_context_mapping
@@ -70,14 +86,20 @@ module ForemanMaintain::Scenarios
       end
 
       def compose
-        add_steps_with_context(
-          Procedures::Packages::UpdateAllConfirmation,
-          Procedures::Packages::InstallerConfirmation,
-          Procedures::Packages::UnlockVersions
-        )
-        add_step_with_context(Procedures::Packages::Update, :force => true, :warn_on_errors => true)
-        add_step_with_context(Procedures::Installer::Upgrade)
-        add_step(Procedures::Packages::LockingStatus)
+        if Packages.skip_installer_run?(context.get(:packages))
+          add_step_with_context(Procedures::Packages::Update,
+                                :force => true, :warn_on_errors => true)
+        else
+          add_steps_with_context(
+            Procedures::Packages::UpdateAllConfirmation,
+            Procedures::Packages::InstallerConfirmation,
+            Procedures::Packages::UnlockVersions
+          )
+          add_step_with_context(Procedures::Packages::Update,
+                                :force => true, :warn_on_errors => true)
+          add_step_with_context(Procedures::Installer::Upgrade)
+          add_step(Procedures::Packages::LockingStatus)
+        end
       end
 
       def set_context_mapping

data/definitions/scenarios/upgrade_to_capsule_6_7.rb

@@ -49,11 +49,15 @@ module Scenarios::Capsule_6_7
       tags :migrations
     end
 
+    def set_context_mapping
+      context.map(:assumeyes, Procedures::Installer::Upgrade => :assumeyes)
+    end
+
     def compose
       add_step(Procedures::Repositories::Setup.new(:version => '6.7'))
       add_step(Procedures::Packages::UnlockVersions.new)
       add_step(Procedures::Packages::Update.new(:assumeyes => true))
-      add_step(Procedures::Installer::Upgrade.new)
+      add_step_with_context(Procedures::Installer::Upgrade)
     end
   end
 

data/definitions/scenarios/upgrade_to_capsule_6_7_z.rb

@@ -49,11 +49,15 @@ module Scenarios::Capsule_6_7_z
       tags :migrations
     end
 
+    def set_context_mapping
+      context.map(:assumeyes, Procedures::Installer::Upgrade => :assumeyes)
+    end
+
     def compose
       add_step(Procedures::Repositories::Setup.new(:version => '6.7'))
       add_step(Procedures::Packages::UnlockVersions.new)
       add_step(Procedures::Packages::Update.new(:assumeyes => true))
-      add_step(Procedures::Installer::Upgrade.new)
+      add_step_with_context(Procedures::Installer::Upgrade)
     end
   end
 

data/definitions/scenarios/upgrade_to_capsule_6_8.rb

@@ -49,11 +49,15 @@ module Scenarios::Capsule_6_8
       tags :migrations
     end
 
+    def set_context_mapping
+      context.map(:assumeyes, Procedures::Installer::Upgrade => :assumeyes)
+    end
+
     def compose
       add_step(Procedures::Repositories::Setup.new(:version => '6.8'))
       add_step(Procedures::Packages::UnlockVersions.new)
       add_step(Procedures::Packages::Update.new(:assumeyes => true))
-      add_step(Procedures::Installer::Upgrade.new)
+      add_step_with_context(Procedures::Installer::Upgrade)
     end
   end
 

data/definitions/scenarios/upgrade_to_capsule_6_8_z.rb

@@ -49,11 +49,15 @@ module Scenarios::Capsule_6_8_z
       tags :migrations
     end
 
+    def set_context_mapping
+      context.map(:assumeyes, Procedures::Installer::Upgrade => :assumeyes)
+    end
+
     def compose
       add_step(Procedures::Repositories::Setup.new(:version => '6.8'))
       add_step(Procedures::Packages::UnlockVersions.new)
       add_step(Procedures::Packages::Update.new(:assumeyes => true))
-      add_step(Procedures::Installer::Upgrade.new)
+      add_step_with_context(Procedures::Installer::Upgrade)
     end
   end
 

data/definitions/scenarios/upgrade_to_satellite_6_2.rb

@@ -49,11 +49,15 @@ module Scenarios::Satellite_6_2
       tags :migrations
     end
 
+    def set_context_mapping
+      context.map(:assumeyes, Procedures::Installer::Upgrade => :assumeyes)
+    end
+
     def compose
       add_step(Procedures::Repositories::Setup.new(:version => '6.2'))
       add_step(Procedures::Packages::UnlockVersions.new)
       add_step(Procedures::Packages::Update.new(:assumeyes => true))
-      add_step(Procedures::Installer::Upgrade.new)
+      add_step_with_context(Procedures::Installer::Upgrade)
     end
   end
 

data/definitions/scenarios/upgrade_to_satellite_6_2_z.rb

@@ -49,11 +49,15 @@ module Scenarios::Satellite_6_2_z
       tags :migrations
     end
 
+    def set_context_mapping
+      context.map(:assumeyes, Procedures::Installer::Upgrade => :assumeyes)
+    end
+
     def compose
       add_step(Procedures::Repositories::Setup.new(:version => '6.2'))
       add_step(Procedures::Packages::UnlockVersions.new)
       add_step(Procedures::Packages::Update.new(:assumeyes => true))
-      add_step(Procedures::Installer::Upgrade.new)
+      add_step_with_context(Procedures::Installer::Upgrade)
     end
   end
 

data/definitions/scenarios/upgrade_to_satellite_6_3.rb

@@ -50,11 +50,15 @@ module Scenarios::Satellite_6_3
       tags :migrations
     end
 
+    def set_context_mapping
+      context.map(:assumeyes, Procedures::Installer::Upgrade => :assumeyes)
+    end
+
     def compose
       add_step(Procedures::Repositories::Setup.new(:version => '6.3'))
       add_step(Procedures::Packages::UnlockVersions.new)
       add_step(Procedures::Packages::Update.new(:assumeyes => true))
-      add_step(Procedures::Installer::Upgrade.new)
+      add_step_with_context(Procedures::Installer::Upgrade)
     end
   end
 

data/definitions/scenarios/upgrade_to_satellite_6_3_z.rb

@@ -49,11 +49,15 @@ module Scenarios::Satellite_6_3_z
       tags :migrations
     end
 
+    def set_context_mapping
+      context.map(:assumeyes, Procedures::Installer::Upgrade => :assumeyes)
+    end
+
     def compose
       add_step(Procedures::Repositories::Setup.new(:version => '6.3'))
       add_step(Procedures::Packages::UnlockVersions.new)
       add_step(Procedures::Packages::Update.new(:assumeyes => true))
-      add_step(Procedures::Installer::Upgrade.new)
+      add_step_with_context(Procedures::Installer::Upgrade)
     end
   end
 

data/definitions/scenarios/upgrade_to_satellite_6_4.rb

@@ -50,11 +50,15 @@ module Scenarios::Satellite_6_4
       tags :migrations
     end
 
+    def set_context_mapping
+      context.map(:assumeyes, Procedures::Installer::Upgrade => :assumeyes)
+    end
+
     def compose
       add_step(Procedures::Repositories::Setup.new(:version => '6.4'))
       add_step(Procedures::Packages::UnlockVersions.new)
       add_step(Procedures::Packages::Update.new(:assumeyes => true))
-      add_step(Procedures::Installer::Upgrade.new)
+      add_step_with_context(Procedures::Installer::Upgrade)
     end
   end
 

data/definitions/scenarios/upgrade_to_satellite_6_4_z.rb

@@ -49,11 +49,15 @@ module Scenarios::Satellite_6_4_z
       tags :migrations
     end
 
+    def set_context_mapping
+      context.map(:assumeyes, Procedures::Installer::Upgrade => :assumeyes)
+    end
+
     def compose
       add_step(Procedures::Repositories::Setup.new(:version => '6.4'))
       add_step(Procedures::Packages::UnlockVersions.new)
       add_step(Procedures::Packages::Update.new(:assumeyes => true))
-      add_step(Procedures::Installer::Upgrade.new)
+      add_step_with_context(Procedures::Installer::Upgrade)
     end
   end
 

data/definitions/scenarios/upgrade_to_satellite_6_5.rb

@@ -49,11 +49,15 @@ module Scenarios::Satellite_6_5
       tags :migrations
     end
 
+    def set_context_mapping
+      context.map(:assumeyes, Procedures::Installer::Upgrade => :assumeyes)
+    end
+
     def compose
       add_step(Procedures::Repositories::Setup.new(:version => '6.5'))
       add_step(Procedures::Packages::UnlockVersions.new)
       add_step(Procedures::Packages::Update.new(:assumeyes => true))
-      add_step(Procedures::Installer::Upgrade.new)
+      add_step_with_context(Procedures::Installer::Upgrade)
     end
   end
 

data/definitions/scenarios/upgrade_to_satellite_6_5_z.rb

@@ -49,11 +49,15 @@ module Scenarios::Satellite_6_5_z
       tags :migrations
     end
 
+    def set_context_mapping
+      context.map(:assumeyes, Procedures::Installer::Upgrade => :assumeyes)
+    end
+
     def compose
       add_step(Procedures::Repositories::Setup.new(:version => '6.5'))
       add_step(Procedures::Packages::UnlockVersions.new)
       add_step(Procedures::Packages::Update.new(:assumeyes => true))
-      add_step(Procedures::Installer::Upgrade.new)
+      add_step_with_context(Procedures::Installer::Upgrade)
     end
   end
 

data/definitions/scenarios/upgrade_to_satellite_6_6.rb

@@ -49,11 +49,15 @@ module Scenarios::Satellite_6_6
       tags :migrations
     end
 
+    def set_context_mapping
+      context.map(:assumeyes, Procedures::Installer::Upgrade => :assumeyes)
+    end
+
     def compose
       add_step(Procedures::Repositories::Setup.new(:version => '6.6'))
       add_step(Procedures::Packages::UnlockVersions.new)
       add_step(Procedures::Packages::Update.new(:assumeyes => true))
-      add_step(Procedures::Installer::Upgrade.new)
+      add_step_with_context(Procedures::Installer::Upgrade)
     end
   end
 

data/definitions/scenarios/upgrade_to_satellite_6_6_z.rb

@@ -49,11 +49,15 @@ module Scenarios::Satellite_6_6_z
       tags :migrations
     end
 
+    def set_context_mapping
+      context.map(:assumeyes, Procedures::Installer::Upgrade => :assumeyes)
+    end
+
     def compose
       add_step(Procedures::Repositories::Setup.new(:version => '6.6'))
       add_step(Procedures::Packages::UnlockVersions.new)
       add_step(Procedures::Packages::Update.new(:assumeyes => true))
-      add_step(Procedures::Installer::Upgrade.new)
+      add_step_with_context(Procedures::Installer::Upgrade)
     end
   end
 

data/definitions/scenarios/upgrade_to_satellite_6_7.rb

@@ -49,11 +49,15 @@ module Scenarios::Satellite_6_7
       tags :migrations
     end
 
+    def set_context_mapping
+      context.map(:assumeyes, Procedures::Installer::Upgrade => :assumeyes)
+    end
+
     def compose
       add_step(Procedures::Repositories::Setup.new(:version => '6.7'))
       add_step(Procedures::Packages::UnlockVersions.new)
       add_step(Procedures::Packages::Update.new(:assumeyes => true))
-      add_step(Procedures::Installer::Upgrade.new)
+      add_step_with_context(Procedures::Installer::Upgrade)
     end
   end
 

data/definitions/scenarios/upgrade_to_satellite_6_7_z.rb

@@ -49,11 +49,15 @@ module Scenarios::Satellite_6_7_z
       tags :migrations
     end
 
+    def set_context_mapping
+      context.map(:assumeyes, Procedures::Installer::Upgrade => :assumeyes)
+    end
+
     def compose
       add_step(Procedures::Repositories::Setup.new(:version => '6.7'))
       add_step(Procedures::Packages::UnlockVersions.new)
       add_step(Procedures::Packages::Update.new(:assumeyes => true))
-      add_step(Procedures::Installer::Upgrade.new)
+      add_step_with_context(Procedures::Installer::Upgrade)
     end
   end
 

data/definitions/scenarios/upgrade_to_satellite_6_8.rb

@@ -49,11 +49,15 @@ module Scenarios::Satellite_6_8
       tags :migrations
     end
 
+    def set_context_mapping
+      context.map(:assumeyes, Procedures::Installer::Upgrade => :assumeyes)
+    end
+
     def compose
       add_step(Procedures::Repositories::Setup.new(:version => '6.8'))
       add_step(Procedures::Packages::UnlockVersions.new)
       add_step(Procedures::Packages::Update.new(:assumeyes => true))
-      add_step(Procedures::Installer::Upgrade.new)
+      add_step_with_context(Procedures::Installer::Upgrade)
     end
   end
 

data/definitions/scenarios/upgrade_to_satellite_6_8_z.rb

@@ -49,11 +49,15 @@ module Scenarios::Satellite_6_8_z
       tags :migrations
     end
 
+    def set_context_mapping
+      context.map(:assumeyes, Procedures::Installer::Upgrade => :assumeyes)
+    end
+
     def compose
       add_step(Procedures::Repositories::Setup.new(:version => '6.8'))
       add_step(Procedures::Packages::UnlockVersions.new)
       add_step(Procedures::Packages::Update.new(:assumeyes => true))
-      add_step(Procedures::Installer::Upgrade.new)
+      add_step_with_context(Procedures::Installer::Upgrade)
     end
   end
 

data/lib/foreman_maintain.rb

@@ -143,5 +143,32 @@ module ForemanMaintain
     def upgrade_in_progress
       storage[:upgrade_target_version]
     end
+
+    def pkg_and_cmd_name
+      instance_feature = ForemanMaintain.available_features(:label => :instance).first
+      if instance_feature.downstream
+        return %w[satellite-maintain satellite-maintain]
+      end
+
+      [main_package_name, 'foreman-maintain']
+    end
+
+    def perform_self_upgrade
+      package_name, command = pkg_and_cmd_name
+
+      puts "Checking for new version of #{package_name}..."
+      if ForemanMaintain.package_manager.update_available?(main_package_name)
+        puts "\nUpdating #{package_name} package."
+        ForemanMaintain.package_manager.update(main_package_name, :assumeyes => true)
+        puts "\nThe #{package_name} package successfully updated."\
+             "\nRe-run #{command} with required options!"
+        exit 0
+      end
+      puts "Nothing to update, can't find new version of #{package_name}."
+    end
+
+    def main_package_name
+      'rubygem-foreman_maintain'
+    end
   end
 end

data/lib/foreman_maintain/cli/upgrade_command.rb

@@ -6,6 +6,11 @@ module ForemanMaintain
                :required => false
       end
 
+      def self.disable_self_upgrade_option
+        option '--disable-self-upgrade', :flag, 'Disable automatic self upgrade',
+               :default => false
+      end
+
       def current_target_version
         current_target_version = ForemanMaintain::UpgradeRunner.current_target_version
         if current_target_version && target_version && target_version != current_target_version
@@ -56,8 +61,10 @@ module ForemanMaintain
       subcommand 'check', 'Run pre-upgrade checks before upgrading to specified version' do
         target_version_option
         interactive_option
+        disable_self_upgrade_option
 
         def execute
+          ForemanMaintain.perform_self_upgrade unless disable_self_upgrade?
           upgrade_runner.run_phase(:pre_upgrade_checks)
           exit upgrade_runner.exit_code
         end
@@ -66,6 +73,8 @@ module ForemanMaintain
       subcommand 'run', 'Run full upgrade to a specified version' do
         target_version_option
         interactive_option
+        disable_self_upgrade_option
+
         option '--phase', 'phase', 'run only a specific phase', :required => false do |phase|
           unless UpgradeRunner::PHASES.include?(phase.to_sym)
             raise Error::UsageError, "Unknown phase #{phase}"
@@ -74,6 +83,7 @@ module ForemanMaintain
         end
 
         def execute
+          ForemanMaintain.perform_self_upgrade unless disable_self_upgrade?
           if phase
             upgrade_runner.run_phase(phase.to_sym)
           else

data/lib/foreman_maintain/concerns/downstream.rb

@@ -87,8 +87,7 @@ module ForemanMaintain
                  else
                    "rhel-#{rh_version_major}-server-#{package_name}-#{full_version}-rpms"
                  end
-
-        if current_minor_version == '6.3' && server_version.to_s != '6.4' && (
+        if current_minor_version == '6.3' && full_version.to_s != '6.4' && (
           feature(:puppet_server) && feature(:puppet_server).puppet_version.major == 4)
           # TODO: confirm repo for capsule. It might be same repo
           repos << "rhel-#{rh_version_major}-server-satellite-tools-6.3-puppet4-rpms"

data/lib/foreman_maintain/package_manager/dnf.rb

@@ -1,17 +1,23 @@
 module ForemanMaintain::PackageManager
   class Dnf < Yum
-    def clean_cache
-      dnf_action('clean', 'all')
+    def clean_cache(assumeyes: false)
+      dnf_action('clean', 'all', :assumeyes => assumeyes)
       super
     end
 
     private
 
-    def dnf_action(action, packages, assumeyes: false)
+    def dnf_action(action, packages, with_status: false, assumeyes: false)
       yum_options = []
       yum_options << '-y' if assumeyes
-      sys.execute!("dnf #{yum_options.join(' ')} #{action} #{packages.join(' ')}",
-                   :interactive => true)
+      if with_status
+        sys.execute_with_status("dnf #{yum_options.join(' ')} #{action} #{packages.join(' ')}",
+                                :interactive => !assumeyes)
+      else
+        sys.execute!("dnf #{yum_options.join(' ')} #{action} #{packages.join(' ')}",
+                     :interactive => !assumeyes)
+
+      end
     end
   end
 end

data/lib/foreman_maintain/package_manager/yum.rb

@@ -57,8 +57,13 @@ module ForemanMaintain::PackageManager
       yum_action('update', packages, :assumeyes => assumeyes)
     end
 
-    def clean_cache
-      yum_action('clean', 'all')
+    def clean_cache(assumeyes: false)
+      yum_action('clean', 'all', :assumeyes => assumeyes)
+    end
+
+    def update_available?(package)
+      cmd_output = yum_action('check-update -q', package, :with_status => true, :assumeyes => false)
+      cmd_output[0] == 100
     end
 
     def files_not_owned_by_package(directory)
@@ -96,14 +101,19 @@ module ForemanMaintain::PackageManager
       File.open(protector_config_file, 'w') { |file| file.puts config }
     end
 
-    def yum_action(action, packages, assumeyes: false)
+    def yum_action(action, packages, with_status: false, assumeyes: false)
       yum_options = []
       packages = [packages].flatten(1)
       yum_options << '-y' if assumeyes
       yum_options_s = yum_options.empty? ? '' : ' ' + yum_options.join(' ')
       packages_s = packages.empty? ? '' : ' ' + packages.join(' ')
-      sys.execute!("yum#{yum_options_s} #{action}#{packages_s}",
-                   :interactive => true)
+      if with_status
+        sys.execute_with_status("yum#{yum_options_s} #{action}#{packages_s}",
+                                :interactive => !assumeyes)
+      else
+        sys.execute!("yum#{yum_options_s} #{action}#{packages_s}",
+                     :interactive => !assumeyes)
+      end
     end
 
     def install_extras(src, dest, override: false)

data/lib/foreman_maintain/reporter/cli_reporter.rb

@@ -16,7 +16,6 @@ module ForemanMaintain
           @spinner_chars = %w[| / - \\]
           @current_line = ''
           @puts_needed = false
-          start_spinner
         end
 
         def update(line)
@@ -42,8 +41,6 @@ module ForemanMaintain
           end
         end
 
-        private
-
         def start_spinner
           @thread = Thread.new do
             loop do
@@ -53,6 +50,8 @@ module ForemanMaintain
           end
         end
 
+        private
+
         def spin
           @mutex.synchronize do
             return unless @active
@@ -80,6 +79,7 @@ module ForemanMaintain
         @line_char = '-'
         @cell_char = '|'
         @spinner = Spinner.new(self)
+        @spinner.start_spinner if @stdout.tty?
         @last_line = ''
       end
 

data/lib/foreman_maintain/utils/facter.rb

@@ -5,7 +5,7 @@ module ForemanMaintain::Utils
     FACTER_FILES = %w[/usr/bin/facter /opt/puppetlabs/bin/facter].freeze
 
     def self.package
-      puppet_version = version(execute!('puppet --version'))
+      puppet_version = version(execute!('/opt/puppetlabs/bin/puppet --version'))
 
       puppet_version.major >= 4 ? 'puppet-agent' : 'facter'
     end

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

@@ -10,6 +10,12 @@ module ForemanMaintain::Utils
         @options = options
       end
 
+      def socket
+        if @options[:socket]
+          self.class.new("#{@options[:socket]}.socket", priority)
+        end
+      end
+
       def <=>(other)
         prio_cmp = @priority <=> other.priority
         prio_cmp == 0 ? @name <=> other.name : prio_cmp

data/lib/foreman_maintain/version.rb

@@ -1,3 +1,3 @@
 module ForemanMaintain
-  VERSION = '0.6.3'.freeze
+  VERSION = '0.6.4'.freeze
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: foreman_maintain
 version: !ruby/object:Gem::Version
-  version: 0.6.3
+  version: 0.6.4
 platform: ruby
 authors:
 - Ivan Nečas
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2020-04-02 00:00:00.000000000 Z
+date: 2020-05-27 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: clamp
@@ -122,7 +122,6 @@ files:
 - definitions/checks/backup/directory_ready.rb
 - definitions/checks/candlepin/db_up.rb
 - definitions/checks/candlepin/validate_db.rb
-- definitions/checks/check_epel_repository.rb
 - definitions/checks/check_hotfix_installed.rb
 - definitions/checks/check_tmout.rb
 - definitions/checks/disk/available_space.rb
@@ -148,6 +147,7 @@ files:
 - definitions/checks/puppet/provide_upgrade_guide.rb
 - definitions/checks/puppet/verify_no_empty_cacert_requests.rb
 - definitions/checks/remote_execution/verify_settings_file_already_exists.rb
+- definitions/checks/repositories/check_non_rh_repository.rb
 - definitions/checks/repositories/check_upstream_repository.rb
 - definitions/checks/repositories/validate.rb
 - definitions/checks/restore/validate_backup.rb
@@ -158,6 +158,7 @@ files:
 - definitions/checks/system_registration.rb
 - definitions/checks/version_locking_enabled.rb
 - definitions/checks/yum_exclude.rb
+- definitions/features/apache.rb
 - definitions/features/candlepin.rb
 - definitions/features/candlepin_database.rb
 - definitions/features/capsule.rb
@@ -264,7 +265,6 @@ files:
 - definitions/procedures/restore/pg_global_objects.rb
 - definitions/procedures/restore/postgres_owner.rb
 - definitions/procedures/restore/pulpcore_dump.rb
-- definitions/procedures/restore/regenerate_missing_queues.rb
 - definitions/procedures/selinux/set_file_security.rb
 - definitions/procedures/service/base.rb
 - definitions/procedures/service/daemon_reload.rb

data/definitions/checks/check_epel_repository.rb

@@ -1,21 +0,0 @@
-class Checks::CheckEpelRepository < ForemanMaintain::Check
-  metadata do
-    label :check_epel_repository
-    description 'Check if EPEL repository enabled on system'
-    tags :pre_upgrade
-    confine do
-      feature(:instance).downstream
-    end
-  end
-
-  def run
-    with_spinner('Checking for presence of EPEL repository') do
-      assert(!epel_enabled?, 'System is subscribed to EPEL repository')
-    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)
-  end
-end

data/definitions/procedures/restore/regenerate_missing_queues.rb

@@ -1,52 +0,0 @@
-module Procedures::Restore
-  class RegenerateMissingQueues < ForemanMaintain::Procedure
-    
-    metadata do
-      description 'Regenrate queues'
-
-      param :handle_services,
-            'Stop and start services if required',
-            :flag => true,
-            :default => false
-    end
-
-    def hostname
-      execute('hostname -f')
-    end
-
-    def ssl_cert
-      "/etc/pki/katello/certs/#{hostanme}-qpid-broker.crt"
-    end
-
-    def ssl_key
-      "/etc/pki/katello/private/#{hostanme}-qpid-broker.key"
-    end
-
-    def amqps_url
-      'amqps://localhost:5671'
-    end
-
-    def run
-      with_spinner('Resetting the queues') do |spinner|
-        reset_queues
-      end
-    end
-
-    def reset_queues      
-      execute!('rm -rf /var/lib/qpidd/.qpidd/qls')
-      Procedures::Service::Start(:only => 'qpidd')
-      puts "Sleeping for 60 seconds for qpid to start fully"
-      sleep 60
-
-      puts "Recreating infrastructure queues.."
-      execute!("qpid-config --ssl-certificate #{ssl_cert} --ssl-key #{ssl_key} -b #{amqps_url} add exchange topic event --durable")
-      execute!("qpid-config --ssl-certificate #{ssl_cert} --ssl-key #{ssl_key} -b #{amqps_url} add queue katello_event_queue --durable")
-      %w[compliance.created entitlement.created entitlement.deleted pool.created pool.deleted].each do |key|
-      execute!("qpid-config --ssl-certificate #{ssl_cert} --ssl-key #{ssl_key} -b #{amqps_url} bind event katello_event_queue #{key}")
-    end
-
-
-
-    end
-  end
-end