foreman_maintain 0.4.10 → 0.5.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 5e987c2a5c95bc27df7b64d739c05cd6779041dc417f13934586931d9e966889
-  data.tar.gz: 8a5e15f6c859d19b8392e620de886d18173327627ee79cf26732ae928fb79aff
+  metadata.gz: f7559f6d4d97f5b61279e22233855efd6ffcf4061013b107389f9bb0469832e5
+  data.tar.gz: 9a3c76b2006e87a0f2d5a6021f26a35624c70e08409dafffa76e1a518565e89a
 SHA512:
-  metadata.gz: 7455550b50b9d07f3eb1b25a822624376b24f78f539c111ed88013bbc862811ea9da0984d57787ac292e579ae0a0778916b17698a9194c9ece457122986363f1
-  data.tar.gz: c70bc731147c15cc1d5bd177cf971d27dfdc096326b6268b7e4c21d95f75275043dbb528dce3ca1866293148c9f6f68aa47bb9370834e51595f804b0e7d3254a
+  metadata.gz: 7967c8ed3ec1830e917f25765626758ba4d8d1af636d7003e6522ddd038540fab1f33d62630cacd1dfd2855084bb2e2b4cbc50be84ed8582e3157a819f7bb4d5
+  data.tar.gz: 7c5fbf539f92af28e9e4326b276812c1f4bb4a13aaca8b0948f7c8d33fb26f7480864d6d269cb141c50e8870cc7a1dae9e668c25163d4b86fadf8033c4cf1cb6

data/README.md

@@ -13,8 +13,8 @@ Subcommands:
       list                          List the checks based on criteria
       list-tags                     List the tags to use for filtering checks
       check                         Run the health checks against the system
-        --label label               Run only a specific check
-        --tags tags                 Limit only for specific set of tags
+        --label label               Run only a specific check with a label
+        --tags tags                 Run only those with all specific set of tags
 
     upgrade                       Upgrade related commands
       list-versions                 List versions this system is upgradable to

data/definitions/checks/backup/certs_tar_exist.rb

@@ -3,17 +3,17 @@ module Checks::Backup
     metadata do
       description 'Check if proxy certs_tar exist'
       tags :backup
-      for_feature :foreman_proxy
+      confine do
+        feature(:foreman_proxy) && !feature(:foreman_proxy).internal?
+      end
     end
 
     def run
-      unless feature(:foreman_proxy).internal?
-        if certs_tar && !File.exist?(certs_tar)
-          name = feature(:instance).proxy_product_name
-          fail! "#{name} certs tar file is not present on the system" \
-                " in path '#{certs_tar}'. \nPlease move the file back to that" \
-                ' location or generate a new one on the main server.'
-        end
+      if certs_tar && !File.exist?(certs_tar)
+        name = feature(:instance).foreman_proxy_product_name
+        fail! "#{name} certs tar file is not present on the system" \
+              " in path '#{certs_tar}'. \nPlease move the file back to that" \
+              ' location or generate a new one on the main server.'
       end
     end
 

data/definitions/checks/candlepin/validate_db.rb

@@ -12,7 +12,7 @@ module Checks::Candlepin
     def run
       result, result_msg = feature(:candlepin_database).execute_cpdb_validate_cmd
       next_steps = []
-      if feature(:downstream) && feature(:downstream).current_minor_version == '6.2'
+      if feature(:satellite) && feature(:satellite).current_minor_version == '6.2'
         next_steps.concat(
           [Procedures::Candlepin::DeleteOrphanedRecordsFromEnvContent.new,
            Procedures::KnowledgeBaseArticle.new(:doc => 'fix_cpdb_validate_failure')]

data/definitions/checks/check_epel_repository.rb

@@ -4,7 +4,7 @@ class Checks::CheckEpelRepository < ForemanMaintain::Check
     description 'Check if EPEL repository enabled on system'
     tags :pre_upgrade
     confine do
-      feature(:downstream)
+      feature(:instance).downstream
     end
   end
 

data/definitions/checks/check_hotfix_installed.rb

@@ -8,12 +8,12 @@ class Checks::CheckHotfixInstalled < ForemanMaintain::Check
     end
 
     confine do
-      feature(:downstream)
+      feature(:instance).downstream
     end
   end
 
   def run
-    if feature(:downstream).subscribed_using_activation_key?
+    if feature(:instance).downstream.subscribed_using_activation_key?
       skip "Your system is subscribed using custom activation key. Hotfixes can't be detected."
     else
       with_spinner('Checking for presence of hotfix(es). It may take some time to verify.') do

data/definitions/checks/disk/performance.rb

@@ -13,8 +13,10 @@ module Checks
       end
 
       EXPECTED_IO = 60
-      DEFAULT_UNIT   = 'MB/sec'.freeze
-      DEFAULT_DIRS   = ['/var/lib/pulp', '/var/lib/mongodb', '/var/lib/pgsql'].freeze
+      DEFAULT_UNIT = 'MB/sec'.freeze
+      DEFAULT_DIRS = [
+        '/var/lib/pulp', '/var/lib/mongodb', '/var/lib/pgsql'
+      ].select { |file_path| File.directory?(file_path) }.freeze
 
       attr_reader :stats
 
@@ -26,7 +28,8 @@ module Checks
           puts "\n"
           puts stats.stdout
 
-          if feature(:downstream) && feature(:downstream).at_least_version?('6.3')
+          current_downstream_feature = feature(:instance).downstream
+          if current_downstream_feature && current_downstream_feature.at_least_version?('6.3')
             assert(success, io_obj.slow_disk_error_msg + warning_message, :warn => true)
           else
             assert(success, io_obj.slow_disk_error_msg)

data/definitions/checks/puppet/provide_upgrade_guide.rb

@@ -4,8 +4,8 @@ module Checks::Puppet
       description 'Verify puppet and provide upgrade guide for it'
       tags :puppet_upgrade_guide
       confine do
-        feature(:downstream) &&
-          feature(:downstream).current_minor_version == '6.3' &&
+        feature(:instance).downstream &&
+          feature(:instance).downstream.current_minor_version == '6.3' &&
           find_package('puppet')
       end
       manual_detection
@@ -15,7 +15,7 @@ module Checks::Puppet
       with_spinner('Verifying puppet version before upgrade') do |spinner|
         puppet_package = find_package('puppet')
         spinner.update "current puppet version: #{puppet_package}"
-        curr_sat_version = feature(:downstream).current_minor_version
+        curr_sat_version = feature(:instance).downstream.current_minor_version
         assert(
           (puppet_package !~ /puppet-3/),
           'Before continuing with upgrade, please make sure you finish puppet upgrade.',

data/definitions/checks/remote_execution/verify_settings_file_already_exists.rb

@@ -4,8 +4,8 @@ module Checks::RemoteExecution
       description 'Check to verify remote_execution_ssh settings already exist'
 
       confine do
-        feature(:downstream) &&
-          feature(:downstream).current_minor_version == '6.2' &&
+        feature(:instance).downstream &&
+          feature(:instance).downstream.current_minor_version == '6.2' &&
           find_package('tfm-rubygem-smart_proxy_dynflow_core') &&
           file_exists?('/etc/smart_proxy_dynflow_core')
       end

data/definitions/checks/repositories/check_upstream_repository.rb

@@ -7,7 +7,7 @@ class Checks::CheckUpstreamRepository < ForemanMaintain::Check
       Procedures::Packages::Install.new(:packages => %w[yum-utils])
     end
     confine do
-      feature(:downstream)
+      feature(:instance).downstream
     end
   end
 

data/definitions/checks/repositories/validate.rb

@@ -7,7 +7,7 @@ module Checks::Repositories
       end
 
       confine do
-        feature(:downstream)
+        feature(:instance).downstream
       end
 
       param :version,
@@ -18,7 +18,7 @@ module Checks::Repositories
     end
 
     def run
-      if feature(:downstream).subscribed_using_activation_key?
+      if feature(:instance).downstream.subscribed_using_activation_key?
         skip 'Your system is subscribed using custom activation key'
       else
         with_spinner("Validating availability of repositories for #{@version}") do |spinner|
@@ -30,11 +30,12 @@ module Checks::Repositories
     private
 
     def find_absent_repos(spinner)
-      absent_repos = feature(:downstream).absent_repos(@version)
+      current_downstream_feature = feature(:instance).downstream
+      absent_repos = current_downstream_feature.absent_repos(@version)
       unless absent_repos.empty?
         spinner.update('Some repositories missing, calling `subscription-manager refresh`')
-        feature(:downstream).rhsm_refresh
-        absent_repos = feature(:downstream).absent_repos(@version)
+        current_downstream_feature.rhsm_refresh
+        absent_repos = current_downstream_feature.absent_repos(@version)
       end
       unless absent_repos.empty?
         fail!(

data/definitions/checks/system_registration.rb

@@ -5,9 +5,7 @@ class Checks::SystemRegistration < ForemanMaintain::Check
     tags :default
 
     confine do
-      file_exists?('/etc/rhsm/rhsm.conf') &&
-        !feature(:foreman_server) &&
-        feature(:foreman_proxy)
+      file_exists?('/etc/rhsm/rhsm.conf') && feature(:instance).downstream
     end
   end
 

data/definitions/features/capsule.rb

@@ -0,0 +1,20 @@
+class Features::Capsule < ForemanMaintain::Feature
+  include ForemanMaintain::Concerns::Downstream
+
+  metadata do
+    label :capsule
+
+    confine do
+      feature(:package_manager).installed?(['satellite-capsule']) ||
+        feature(:package_manager).installed?(['capsule-installer'])
+    end
+  end
+
+  def current_version
+    @current_version ||= rpm_version(package_name)
+  end
+
+  def package_name
+    'satellite-capsule'
+  end
+end

data/definitions/features/cron.rb

@@ -3,7 +3,7 @@ class Features::Cron < ForemanMaintain::Feature
     label :cron
     confine do
       ForemanMaintain.config.manage_crond && !(
-        feature(:downstream) && feature(:downstream).less_than_version?('6.3')
+        feature(:instance).downstream && feature(:instance).downstream.less_than_version?('6.3')
       )
     end
   end

data/definitions/features/foreman_server.rb

@@ -38,7 +38,7 @@ module ForemanMaintain
 
       def config_files_to_exclude
         [
-          '/var/lib/foreman/public/assets'
+          '/var/lib/foreman/public'
         ]
       end
     end

data/definitions/features/installer.rb

@@ -66,13 +66,14 @@ class Features::Installer < ForemanMaintain::Feature
 
   def last_scenario
     return nil unless with_scenarios?
+
     File.basename(last_scenario_config).split('.')[0]
   end
 
   def installer_command
     case @installer_type
     when :scenarios
-      if feature(:downstream)
+      if feature(:satellite)
         'satellite-installer'
       else
         'foreman-installer'

data/definitions/features/instance.rb

@@ -7,11 +7,11 @@ class Features::Instance < ForemanMaintain::Feature
   end
 
   def foreman_proxy_product_name
-    feature(:downstream) ? 'Capsule' : 'Foreman Proxy'
+    feature(:capsule) ? 'Capsule' : 'Foreman Proxy'
   end
 
   def server_product_name
-    if feature(:downstream)
+    if feature(:satellite)
       'Satellite'
     elsif feature(:katello)
       'Katello'
@@ -20,12 +20,8 @@ class Features::Instance < ForemanMaintain::Feature
     end
   end
 
-  def external_proxy?
-    !!(feature(:foreman_proxy) && !feature(:foreman_server))
-  end
-
   def product_name
-    if external_proxy?
+    if feature(:foreman_proxy) && !feature(:foreman_proxy).internal?
       foreman_proxy_product_name
     else
       server_product_name
@@ -48,10 +44,14 @@ class Features::Instance < ForemanMaintain::Feature
     feature(:foreman_proxy) && feature(:foreman_proxy).with_content? && !feature(:katello)
   end
 
+  def downstream
+    @downstream ||= (feature(:satellite) || feature(:capsule))
+  end
+
   def ping
     if feature(:katello)
       katello_ping
-    elsif external_proxy?
+    elsif feature(:foreman_proxy) && !feature(:foreman_proxy).internal?
       proxy_ping
     else
       foreman_ping
@@ -112,6 +112,12 @@ class Features::Instance < ForemanMaintain::Feature
   end
 
   def pick_failing_components(components)
+    if feature(:katello).current_version < Gem::Version.new('3.2.0')
+      # Note that katello_ping returns an empty result against foreman_auth.
+      # https://github.com/Katello/katello/commit/95d7b9067d38f269a5ec121fb73b5c19d4422baf
+      components.reject! { |n| n.eql?('foreman_auth') }
+    end
+
     components.each_with_object([]) do |(name, data), failing|
       failing << name unless data['status'] == 'ok'
     end
@@ -129,7 +135,7 @@ class Features::Instance < ForemanMaintain::Feature
 
   def component_features_map
     {
-      'candlepin_auth' =>  %w[candlepin candlepin_database],
+      'candlepin_auth' => %w[candlepin candlepin_database],
       'candlepin' => %w[candlepin candlepin_database],
       'pulp_auth' => %w[pulp mongo],
       'pulp' => %w[pulp mongo],

data/definitions/features/satellite.rb

@@ -0,0 +1,25 @@
+class Features::Satellite < ForemanMaintain::Feature
+  include ForemanMaintain::Concerns::Downstream
+
+  metadata do
+    label :satellite
+
+    confine do
+      feature(:package_manager).installed?(['satellite'])
+    end
+  end
+
+  def current_version
+    @current_version ||= rpm_version(package_name) || version_from_source
+  end
+
+  def package_name
+    'satellite'
+  end
+
+  private
+
+  def version_from_source
+    version(File.read('/usr/share/foreman/lib/satellite/version.rb')[/6\.\d\.\d/])
+  end
+end

data/definitions/features/service.rb

@@ -9,7 +9,7 @@ class Features::Service < ForemanMaintain::Feature
     # { :exclude => ["pulp-workers", "tomcat"] }
     # { :include => ["crond"] }
 
-    if feature(:downstream) && feature(:downstream).less_than_version?('6.3')
+    if feature(:instance).downstream && feature(:instance).downstream.less_than_version?('6.3')
       use_katello_service(action, options)
     else
       use_system_service(action, options, spinner)
@@ -157,7 +157,7 @@ class Features::Service < ForemanMaintain::Feature
     command = "katello-service #{action} "
 
     # katello-service in 6.1 does not support --only
-    if feature(:downstream).less_than_version?('6.2')
+    if feature(:instance).downstream.less_than_version?('6.2')
       excluded_services = exclude_services_only(options)
       command += "--exclude #{excluded_services.join(',')}" if excluded_services.any?
     else

data/definitions/features/upstream.rb

@@ -3,7 +3,8 @@ class Features::Upstream < ForemanMaintain::Feature
     label :upstream
 
     confine do
-      !downstream_installation?
+      # TODO: remove this upstream feature
+      !feature(:instance).downstream
     end
   end
 

data/definitions/procedures/backup/compress_data.rb

@@ -7,7 +7,7 @@ module Procedures::Backup
     end
 
     def run
-      compress_file('pgsql_data.tar', 'Postgress DB')
+      compress_file('pgsql_data.tar', 'Postgres DB')
       compress_file('mongo_data.tar', 'Mongo DB')
     end
 

data/definitions/procedures/backup/config_files.rb

@@ -35,7 +35,8 @@ module Procedures::Backup
       exclude_configs = []
       ForemanMaintain.available_features.each do |feature|
         # exclude proxy as it has special handling later
-        next if feature == feature(:foreman_proxy)
+        next if [:foreman_proxy, :capsule].include?(feature.label)
+
         configs += feature.config_files
         exclude_configs += feature.config_files_to_exclude
       end

data/definitions/procedures/candlepin/delete_orphaned_records_from_env_content.rb

@@ -6,8 +6,7 @@ module Procedures::Candlepin
 
       confine do
         feature(:candlepin_database) &&
-          feature(:downstream) &&
-          feature(:downstream).current_minor_version == '6.2'
+          feature(:satellite) && feature(:satellite).current_minor_version == '6.2'
       end
     end
 

data/definitions/procedures/foreman_proxy/features.rb

@@ -3,7 +3,10 @@ module Procedures::ForemanProxy
     metadata do
       param :load_only, 'Do not print the features', :default => false
       description 'Detect features available in the local proxy'
-      for_feature :foreman_proxy
+
+      confine do
+        feature(:foreman_proxy)
+      end
     end
 
     def run

data/definitions/procedures/knowledge_base_article.rb

@@ -3,7 +3,7 @@ class Procedures::KnowledgeBaseArticle < ForemanMaintain::Procedure
     description 'Show knowledge base article for troubleshooting'
 
     confine do
-      feature(:downstream)
+      feature(:instance).downstream
     end
     param :doc,
           'Document name required to select a correct article',

data/definitions/procedures/repositories/setup.rb

@@ -7,7 +7,7 @@ module Procedures::Repositories
       end
 
       confine do
-        feature(:downstream) || feature(:upstream)
+        feature(:instance).downstream || feature(:upstream)
       end
       param :version,
             'Version for which repositories needs to be setup',
@@ -17,7 +17,7 @@ module Procedures::Repositories
 
     def run
       with_spinner("Configuring repositories for #{@version}") do
-        (feature(:downstream) || feature(:upstream)).setup_repositories(@version)
+        (feature(:instance).downstream || feature(:upstream)).setup_repositories(@version)
       end
     end
   end

data/definitions/scenarios/restore.rb

@@ -67,7 +67,7 @@ module ForemanMaintain::Scenarios
     end
 
     def supported_version_check
-      if feature(:downstream) && feature(:downstream).less_than_version?('6.3')
+      if feature(:instance).downstream && feature(:instance).downstream.less_than_version?('6.3')
         msg = 'ERROR: Restore subcommand is supported by Satellite 6.3+. ' \
               'Please use katello-restore instead.'
         abort(msg)

data/definitions/scenarios/upgrade_to_satellite_6_2.rb

@@ -4,7 +4,7 @@ module Scenarios::Satellite_6_2
       metadata do
         tags :upgrade_to_satellite_6_2
         confine do
-          feature(:downstream) && feature(:downstream).current_minor_version == '6.1'
+          feature(:satellite) && feature(:satellite).current_minor_version == '6.1'
         end
         instance_eval(&block)
       end

data/definitions/scenarios/upgrade_to_satellite_6_2_z.rb

@@ -4,7 +4,7 @@ module Scenarios::Satellite_6_2_z
       metadata do
         tags :upgrade_to_satellite_6_2_z
         confine do
-          feature(:downstream) && feature(:downstream).current_minor_version == '6.2'
+          feature(:satellite) && feature(:satellite).current_minor_version == '6.2'
         end
         instance_eval(&block)
       end

data/definitions/scenarios/upgrade_to_satellite_6_3.rb

@@ -4,7 +4,7 @@ module Scenarios::Satellite_6_3
       metadata do
         tags :upgrade_to_satellite_6_3
         confine do
-          feature(:downstream) && feature(:downstream).current_minor_version == '6.2'
+          feature(:satellite) && feature(:satellite).current_minor_version == '6.2'
         end
         instance_eval(&block)
       end

data/definitions/scenarios/upgrade_to_satellite_6_3_z.rb

@@ -4,7 +4,7 @@ module Scenarios::Satellite_6_3_z
       metadata do
         tags :upgrade_to_satellite_6_3_z
         confine do
-          feature(:downstream) && feature(:downstream).current_minor_version == '6.3'
+          feature(:satellite) && feature(:satellite).current_minor_version == '6.3'
         end
         instance_eval(&block)
       end

data/definitions/scenarios/upgrade_to_satellite_6_4.rb

@@ -4,7 +4,7 @@ module Scenarios::Satellite_6_4
       metadata do
         tags :upgrade_to_satellite_6_4
         confine do
-          feature(:downstream) && feature(:downstream).current_minor_version == '6.3'
+          feature(:satellite) && feature(:satellite).current_minor_version == '6.3'
         end
         instance_eval(&block)
       end

data/definitions/scenarios/upgrade_to_satellite_6_4_z.rb

@@ -4,7 +4,7 @@ module Scenarios::Satellite_6_4_z
       metadata do
         tags :upgrade_to_satellite_6_4_z
         confine do
-          feature(:downstream) && feature(:downstream).current_minor_version == '6.4'
+          feature(:satellite) && feature(:satellite).current_minor_version == '6.4'
         end
         instance_eval(&block)
       end

data/definitions/scenarios/upgrade_to_satellite_6_5.rb

@@ -4,7 +4,7 @@ module Scenarios::Satellite_6_5
       metadata do
         tags :upgrade_to_satellite_6_5
         confine do
-          feature(:downstream) && feature(:downstream).current_minor_version == '6.4'
+          feature(:satellite) && feature(:satellite).current_minor_version == '6.4'
         end
         instance_eval(&block)
       end

data/definitions/scenarios/upgrade_to_satellite_6_5_z.rb

@@ -4,7 +4,7 @@ module Scenarios::Satellite_6_5_z
       metadata do
         tags :upgrade_to_satellite_6_5_z
         confine do
-          feature(:downstream) && feature(:downstream).current_minor_version == '6.5'
+          feature(:satellite) && feature(:satellite).current_minor_version == '6.5'
         end
         instance_eval(&block)
       end

data/definitions/scenarios/upgrade_to_satellite_6_6.rb

@@ -4,7 +4,7 @@ module Scenarios::Satellite_6_6
       metadata do
         tags :upgrade_to_satellite_6_6
         confine do
-          feature(:downstream) && feature(:downstream).current_minor_version == '6.5'
+          feature(:satellite) && feature(:satellite).current_minor_version == '6.5'
         end
         instance_eval(&block)
       end

data/definitions/scenarios/upgrade_to_satellite_6_6_z.rb

@@ -4,7 +4,7 @@ module Scenarios::Satellite_6_6_z
       metadata do
         tags :upgrade_to_satellite_6_6_z
         confine do
-          feature(:downstream) && feature(:downstream).current_minor_version == '6.6'
+          feature(:satellite) && feature(:satellite).current_minor_version == '6.6'
         end
         instance_eval(&block)
       end

data/definitions/scenarios/upgrade_to_satellite_6_7.rb

@@ -0,0 +1,80 @@
+module Scenarios::Satellite_6_7
+  class Abstract < ForemanMaintain::Scenario
+    def self.upgrade_metadata(&block)
+      metadata do
+        tags :upgrade_to_satellite_6_7
+        confine do
+          feature(:satellite) && feature(:satellite).current_minor_version == '6.6'
+        end
+        instance_eval(&block)
+      end
+    end
+  end
+
+  class PreUpgradeCheck < Abstract
+    upgrade_metadata do
+      description 'Checks before upgrading to Satellite 6.7'
+      tags :pre_upgrade_checks
+      run_strategy :fail_slow
+    end
+
+    def compose
+      add_steps(find_checks(:default))
+      add_steps(find_checks(:pre_upgrade))
+      add_step(Checks::Repositories::Validate.new(:version => '6.7'))
+    end
+  end
+
+  class PreMigrations < Abstract
+    upgrade_metadata do
+      description 'Procedures before migrating to Satellite 6.7'
+      tags :pre_migrations
+    end
+
+    def compose
+      add_steps(find_procedures(:pre_migrations))
+      add_step(Procedures::Service::Stop.new)
+    end
+  end
+
+  class Migrations < Abstract
+    upgrade_metadata do
+      description 'Migration scripts to Satellite 6.7'
+      tags :migrations
+    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)
+    end
+  end
+
+  class PostMigrations < Abstract
+    upgrade_metadata do
+      description 'Procedures after migrating to Satellite 6.7'
+      tags :post_migrations
+    end
+
+    def compose
+      add_step(Procedures::Service::Start.new)
+      add_steps(find_procedures(:post_migrations))
+    end
+  end
+
+  class PostUpgradeChecks < Abstract
+    upgrade_metadata do
+      description 'Checks after upgrading to Satellite 6.7'
+      tags :post_upgrade_checks
+      run_strategy :fail_slow
+    end
+
+    def compose
+      add_steps(find_checks(:default))
+      add_steps(find_checks(:post_upgrade))
+    end
+  end
+end
+
+ForemanMaintain::UpgradeRunner.register_version('6.7', :upgrade_to_satellite_6_7)

data/definitions/scenarios/upgrade_to_satellite_6_7_z.rb

@@ -0,0 +1,80 @@
+module Scenarios::Satellite_6_7_z
+  class Abstract < ForemanMaintain::Scenario
+    def self.upgrade_metadata(&block)
+      metadata do
+        tags :upgrade_to_satellite_6_7_z
+        confine do
+          feature(:satellite) && feature(:satellite).current_minor_version == '6.7'
+        end
+        instance_eval(&block)
+      end
+    end
+  end
+
+  class PreUpgradeCheck < Abstract
+    upgrade_metadata do
+      description 'Checks before upgrading to Satellite 6.7.z'
+      tags :pre_upgrade_checks
+      run_strategy :fail_slow
+    end
+
+    def compose
+      add_steps(find_checks(:default))
+      add_steps(find_checks(:pre_upgrade))
+      add_step(Checks::Repositories::Validate.new(:version => '6.7'))
+    end
+  end
+
+  class PreMigrations < Abstract
+    upgrade_metadata do
+      description 'Procedures before migrating to Satellite 6.7.z'
+      tags :pre_migrations
+    end
+
+    def compose
+      add_steps(find_procedures(:pre_migrations))
+      add_step(Procedures::Service::Stop.new)
+    end
+  end
+
+  class Migrations < Abstract
+    upgrade_metadata do
+      description 'Migration scripts to Satellite 6.7.z'
+      tags :migrations
+    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)
+    end
+  end
+
+  class PostMigrations < Abstract
+    upgrade_metadata do
+      description 'Procedures after migrating to Satellite 6.7.z'
+      tags :post_migrations
+    end
+
+    def compose
+      add_step(Procedures::Service::Start.new)
+      add_steps(find_procedures(:post_migrations))
+    end
+  end
+
+  class PostUpgradeChecks < Abstract
+    upgrade_metadata do
+      description 'Checks after upgrading to Satellite 6.7.z'
+      tags :post_upgrade_checks
+      run_strategy :fail_slow
+    end
+
+    def compose
+      add_steps(find_checks(:default))
+      add_steps(find_checks(:post_upgrade))
+    end
+  end
+end
+
+ForemanMaintain::UpgradeRunner.register_version('6.7.z', :upgrade_to_satellite_6_7_z)

data/lib/foreman_maintain.rb

@@ -20,6 +20,7 @@ module ForemanMaintain
   require 'foreman_maintain/concerns/hammer'
   require 'foreman_maintain/concerns/base_database'
   require 'foreman_maintain/concerns/directory_marker'
+  require 'foreman_maintain/concerns/downstream'
   require 'foreman_maintain/top_level_modules'
   require 'foreman_maintain/yaml_storage'
   require 'foreman_maintain/config'

data/lib/foreman_maintain/cli/backup_command.rb

@@ -50,9 +50,10 @@ module ForemanMaintain
             unless File.directory?(dir)
               raise ArgumentError, "Previous backup directory does not exist: #{dir}"
             end
+
             dir
           end
-          proxy_name = ForemanMaintain.detector.feature(:downstream) ? 'Capsule' : 'Foreman Proxy'
+          proxy_name = ForemanMaintain.detector.feature(:capsule) ? 'Capsule' : 'Foreman Proxy'
           option '--features', 'FEATURES',
                  "#{proxy_name} features to include in the backup. " \
                      'Valid features are tftp, dns, dhcp, openscap, and all.', :multivalued => true

data/lib/foreman_maintain/cli/base.rb

@@ -135,7 +135,7 @@ module ForemanMaintain
 
       def self.label_option
         option '--label', 'label',
-               'Limit only for a specific label. ' \
+               'Run only a specific check with a label. ' \
                  '(Use "list" command to see available labels)' do |label|
           raise ArgumentError, 'value not specified' if label.nil? || label.empty?
           underscorize(label).to_sym
@@ -144,7 +144,7 @@ module ForemanMaintain
 
       def self.tags_option
         option('--tags', 'tags',
-               'Limit only for specific set of labels. ' \
+               'Run only those with all specific set of tags. ' \
                  '(Use list-tags command to see available tags)',
                :multivalued => true) do |tags|
           raise ArgumentError, 'value not specified' if tags.nil? || tags.empty?

data/lib/foreman_maintain/concerns/downstream.rb

@@ -0,0 +1,123 @@
+module ForemanMaintain
+  module Concerns
+    module Downstream
+      def current_version
+        raise NotImplementedError
+      end
+
+      def less_than_version?(version)
+        Gem::Version.new(current_version) < Gem::Version.new(version)
+      end
+
+      def at_least_version?(version)
+        Gem::Version.new(current_version) >= Gem::Version.new(version)
+      end
+
+      def current_minor_version
+        current_version.to_s[/^\d+\.\d+/]
+      end
+
+      # TODO: Modify activation_key changes as per server
+      def setup_repositories(version)
+        activation_key = ENV['EXTERNAL_SAT_ACTIVATION_KEY']
+        org = ENV['EXTERNAL_SAT_ORG']
+        if activation_key
+          org_options = org ? %(--org #{shellescape(org)}) : ''
+          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}))
+        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_required - repos_found
+      end
+
+      def rhsm_refresh
+        execute!(%(subscription-manager refresh))
+      end
+
+      # TODO: Verify this is valid for capsule?
+      def subscribed_using_activation_key?
+        ENV['EXTERNAL_SAT_ACTIVATION_KEY'] && ENV['EXTERNAL_SAT_ORG']
+      end
+
+      def package_name
+        raise NotImplementedError
+      end
+
+      private
+
+      def rh_repos(server_version)
+        server_version = version(server_version)
+        rh_version_major = ForemanMaintain::Utils::Facter.os_major_release
+        rh_repos = main_rh_repos(rh_version_major)
+
+        server_version_full = "#{server_version.major}.#{server_version.minor}"
+        rh_repos.concat(product_specific_repos(rh_version_major, server_version_full))
+
+        if server_version > version('6.3')
+          rh_repos << ansible_repo(server_version, rh_version_major)
+        end
+
+        rh_repos
+      end
+
+      def ansible_repo(server_version, rh_version_major)
+        if server_version >= version('6.6')
+          "rhel-#{rh_version_major}-server-ansible-2.8-rpms"
+        elsif server_version >= version('6.4')
+          "rhel-#{rh_version_major}-server-ansible-2.6-rpms"
+        end
+      end
+
+      # TODO: refactoring
+      def product_specific_repos(rh_version_major, full_version)
+        repos = []
+        repos << if ENV['FOREMAN_MAINTAIN_USE_BETA'] == '1'
+                   "rhel-server-#{rh_version_major}-#{package_name}-6-beta-rpms"
+                 else
+                   "rhel-#{rh_version_major}-server-#{package_name}-#{full_version}-rpms"
+                 end
+
+        if current_minor_version == '6.3' && server_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"
+        end
+
+        repos.concat(common_repos(rh_version_major, full_version))
+      end
+
+      def common_repos(rh_version_major, full_version)
+        tools_repo_id = "rhel-#{rh_version_major}-server-satellite-tools-#{full_version}-rpms"
+        maintenance_repo_id = "rhel-#{rh_version_major}-server-satellite-maintenance-6-rpms"
+
+        # Override to use Beta repositories for sat version until GA
+        if ENV['FOREMAN_MAINTAIN_USE_BETA'] == '1'
+          tools_repo_id = "rhel-#{rh_version_major}-server-satellite-tools-6-beta-rpms"
+          maintenance_repo_id = "rhel-#{rh_version_major}-server-satellite-maintenance-6-beta-rpms"
+        end
+
+        [tools_repo_id, maintenance_repo_id]
+      end
+
+      def main_rh_repos(rh_version_major)
+        ["rhel-#{rh_version_major}-server-rpms",
+         "rhel-server-rhscl-#{rh_version_major}-rpms"]
+      end
+
+      def version_from_source
+        raise NotImplementedError
+      end
+    end
+  end
+end

data/lib/foreman_maintain/concerns/system_helpers.rb

@@ -44,11 +44,6 @@ module ForemanMaintain
         end
       end
 
-      def downstream_installation?
-        execute?('rpm -q satellite') ||
-          (execute('rpm -q foreman') =~ /sat.noarch/)
-      end
-
       def execute?(command, options = {})
         execute(command, options)
         $CHILD_STATUS.success?
@@ -101,10 +96,6 @@ module ForemanMaintain
         find_package('foreman')
       end
 
-      def smart_proxy?
-        !server? && find_package('foreman-proxy')
-      end
-
       def packages_action(action, packages, options = {})
         options.validate_options!(:assumeyes)
         case action

data/lib/foreman_maintain/version.rb

@@ -1,3 +1,3 @@
 module ForemanMaintain
-  VERSION = '0.4.10'.freeze
+  VERSION = '0.5.0'.freeze
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: foreman_maintain
 version: !ruby/object:Gem::Version
-  version: 0.4.10
+  version: 0.5.0
 platform: ruby
 authors:
 - Ivan Nečas
@@ -157,8 +157,8 @@ files:
 - definitions/checks/yum_exclude.rb
 - definitions/features/candlepin.rb
 - definitions/features/candlepin_database.rb
+- definitions/features/capsule.rb
 - definitions/features/cron.rb
-- definitions/features/downstream.rb
 - definitions/features/foreman_1_11_x.rb
 - definitions/features/foreman_1_7_x.rb
 - definitions/features/foreman_database.rb
@@ -176,6 +176,7 @@ files:
 - definitions/features/package_manager.rb
 - definitions/features/pulp.rb
 - definitions/features/puppet_server.rb
+- definitions/features/satellite.rb
 - definitions/features/service.rb
 - definitions/features/sync_plans.rb
 - definitions/features/system_repos.rb
@@ -276,6 +277,8 @@ files:
 - definitions/scenarios/upgrade_to_satellite_6_5_z.rb
 - definitions/scenarios/upgrade_to_satellite_6_6.rb
 - definitions/scenarios/upgrade_to_satellite_6_6_z.rb
+- definitions/scenarios/upgrade_to_satellite_6_7.rb
+- definitions/scenarios/upgrade_to_satellite_6_7_z.rb
 - extras/foreman-maintain.sh
 - extras/foreman_protector/foreman-protector.conf
 - extras/foreman_protector/foreman-protector.py
@@ -302,6 +305,7 @@ files:
 - lib/foreman_maintain/cli/upgrade_command.rb
 - lib/foreman_maintain/concerns/base_database.rb
 - lib/foreman_maintain/concerns/directory_marker.rb
+- lib/foreman_maintain/concerns/downstream.rb
 - lib/foreman_maintain/concerns/finders.rb
 - lib/foreman_maintain/concerns/hammer.rb
 - lib/foreman_maintain/concerns/logger.rb

data/definitions/features/downstream.rb

@@ -1,111 +0,0 @@
-class Features::Downstream < ForemanMaintain::Feature
-  metadata do
-    label :downstream
-
-    confine do
-      downstream_installation?
-    end
-  end
-
-  def less_than_version?(version)
-    Gem::Version.new(current_version) < Gem::Version.new(version)
-  end
-
-  def at_least_version?(version)
-    Gem::Version.new(current_version) >= Gem::Version.new(version)
-  end
-
-  def current_version
-    @current_version ||= rpm_version('satellite') || version_from_source
-  end
-
-  def current_minor_version
-    current_version.to_s[/^\d+\.\d+/]
-  end
-
-  def setup_repositories(version)
-    activation_key = ENV['EXTERNAL_SAT_ACTIVATION_KEY']
-    org = ENV['EXTERNAL_SAT_ORG']
-    if activation_key
-      org_options = org ? %(--org #{shellescape(org)}) : ''
-      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}))
-    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_required - repos_found
-  end
-
-  def rhsm_refresh
-    execute!(%(subscription-manager refresh))
-  end
-
-  def subscribed_using_activation_key?
-    ENV['EXTERNAL_SAT_ACTIVATION_KEY'] && ENV['EXTERNAL_SAT_ORG']
-  end
-
-  private
-
-  def rh_repos(sat_version)
-    sat_version = version(sat_version)
-    rh_version_major = ForemanMaintain::Utils::Facter.os_major_release
-
-    rh_repos = main_rh_repos(rh_version_major)
-
-    rh_repos.concat(sat_and_tools_repos(rh_version_major, sat_version))
-
-    if sat_version > version('6.3')
-      rh_repos << ansible_repo(sat_version, rh_version_major)
-    end
-
-    if current_minor_version == '6.3' && sat_version.to_s != '6.4' && (
-      feature(:puppet_server) && feature(:puppet_server).puppet_version.major == 4)
-      rh_repos << "rhel-#{rh_version_major}-server-satellite-tools-6.3-puppet4-rpms"
-    end
-
-    rh_repos
-  end
-
-  def ansible_repo(sat_version, rh_version_major)
-    if sat_version >= version('6.6')
-      "rhel-#{rh_version_major}-server-ansible-2.8-rpms"
-    elsif sat_version >= version('6.4')
-      "rhel-#{rh_version_major}-server-ansible-2.6-rpms"
-    end
-  end
-
-  def sat_and_tools_repos(rh_version_major, sat_version)
-    sat_version_full = "#{sat_version.major}.#{sat_version.minor}"
-    sat_repo_id = "rhel-#{rh_version_major}-server-satellite-#{sat_version_full}-rpms"
-    sat_tools_repo_id = "rhel-#{rh_version_major}-server-satellite-tools-#{sat_version_full}-rpms"
-    sat_maintenance_repo_id = "rhel-#{rh_version_major}-server-satellite-maintenance-6-rpms"
-
-    # Override to use Beta repositories for sat version until GA
-    if ENV['FOREMAN_MAINTAIN_USE_BETA'] == '1'
-      sat_repo_id = "rhel-server-#{rh_version_major}-satellite-6-beta-rpms"
-      sat_tools_repo_id = "rhel-#{rh_version_major}-server-satellite-tools-6-beta-rpms"
-      sat_maintenance_repo_id = "rhel-#{rh_version_major}-server-satellite-maintenance-6-beta-rpms"
-    end
-
-    [sat_repo_id, sat_tools_repo_id, sat_maintenance_repo_id]
-  end
-
-  def main_rh_repos(rh_version_major)
-    ["rhel-#{rh_version_major}-server-rpms",
-     "rhel-server-rhscl-#{rh_version_major}-rpms"]
-  end
-
-  def version_from_source
-    version(File.read('/usr/share/foreman/lib/satellite/version.rb')[/6\.\d\.\d/])
-  end
-end