foreman_maintain 0.8.0 → 0.8.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: ed8b16b2a22acb7bf2e2768976f2df46eb6a1b51b883904cbee0bb180869c5a4
-  data.tar.gz: 46473f96dba47ffc94f08fbb15fa031073852cdc234c8c701d5568a7727d269d
+  metadata.gz: 4894231356aabd2a87f57c49952e1860f762908b98770e96d1b60118808927a1
+  data.tar.gz: 92dc7d469e6ac81bf6e7278225077c189d302157ee0d7c9e930ed53a2a5ad029
 SHA512:
-  metadata.gz: 76da2fe52b25ac48af18295caaa92dad1e2cb106a8aaded53adc02804da1ef2c021a6d336e10e4abea87d6aed1f9950a9b994cc6dba075b8b116a31ea9c6b706
-  data.tar.gz: d25955e6f87bfb863d050935bf4ed253c2afa55e1552ec17edcc76500c6d563d7fe318b84d68877c942c63facdd3c93d973591df5e93fedd9fd445a4ff4c845a
+  metadata.gz: c3b440096f343c3ce67b2ee8a94a265eb53141d4c57f6bd9fb49562ba9f3bb8ba8a8886875917c88df7324e1993902b51a125ba02760ab9cfa1820e1d1d9b323
+  data.tar.gz: 17eb800a81f97ff503aa8fbe87c55918dcb99946928079eeab9288c93972a7f287e5acc4d699e8c5294c196bdabb2da978b363d79015ed6b796688c7c063a7a9

data/definitions/checks/non_rh_packages.rb

@@ -0,0 +1,29 @@
+class Checks::NonRhPackages < ForemanMaintain::Check
+  metadata do
+    label :non_rh_packages
+    description 'Check if system has any non Red Hat RPMs installed (e.g.: Fedora)'
+    tags :pre_upgrade
+    confine do
+      feature(:instance).downstream
+    end
+  end
+
+  def run
+    rpm_query_format = '%{NAME}-%{VERSION}-%{RELEASE}.%{ARCH} : %{VENDOR}\n'
+    all_packages = package_manager.list_installed_packages(rpm_query_format)
+    non_rh_packages = all_packages - all_packages.grep(Regexp.union(rh_regexp_list))
+    assert(non_rh_packages.empty?, error_msg(non_rh_packages), :warn => true)
+  end
+
+  def error_msg(packages)
+    "Found #{packages.count} unexpected non Red Hat Package(s) installed!\
+    \nPackage : Vendor\n#{packages.join("\n")}"
+  end
+
+  def rh_regexp_list
+    [/Red Hat, Inc\./, /Red Hat Inc./, /-apache/, /-foreman-proxy/, /-foreman-client/,
+     /-puppet-client/, /-qpid-broker/, /-qpid-client-cert/, /-qpid-router-client/,
+     /-qpid-router-server/, /java-client/, /pulp-client/, /katello-default-ca/, /katello-server-ca/,
+     /katello-ca-consumer/, /gpg-pubkey/, /-tomcat/]
+  end
+end

data/definitions/features/dynflow_sidekiq.rb

@@ -37,6 +37,6 @@ class Features::DynflowSidekiq < ForemanMaintain::Feature
   end
 
   def configured_instances
-    Dir['/etc/foreman/dynflow/*'].map { |config| File.basename(config, '.yml') }
+    Dir['/etc/foreman/dynflow/*.yml'].map { |config| File.basename(config, '.yml') }
   end
 end

data/definitions/features/pulp2.rb

@@ -34,4 +34,10 @@ class Features::Pulp < ForemanMaintain::Feature
       '/etc/default/pulp_workers'
     ]
   end
+
+  def exclude_from_backup
+    # Exclude /var/lib/pulp/katello-export and /var/lib/pulp/cache
+    # since the tar is run from /var/lib/pulp, list subdir paths only
+    ['katello-export', 'cache']
+  end
 end

data/definitions/procedures/backup/pulp.rb

@@ -30,7 +30,7 @@ module Procedures::Backup
       feature(:tar).run(
         :archive => File.join(@backup_dir, 'pulp_data.tar'),
         :command => 'create',
-        :exclude => ['var/lib/pulp/katello-export'],
+        :exclude => feature(:pulp2).exclude_from_backup,
         :listed_incremental => File.join(@backup_dir, '.pulp.snar'),
         :transform => 's,^,var/lib/pulp/,S',
         :volume_size => @tar_volume_size,

data/definitions/procedures/prep_6_10_upgrade.rb

@@ -11,11 +11,11 @@ class Procedures::Prep610Upgrade < ForemanMaintain::Procedure
   def run
     puts time_warning
     with_spinner('Updating filesystem permissions for Pulp 3') do |spinner|
-      spinner.update('$ chmod -R g+rwX /var/lib/pulp/content')
+      spinner.update('# chmod -R g=rwX /var/lib/pulp/content')
       FileUtils.chmod_R 'g=rwX', '/var/lib/pulp/content'
-      spinner.update("$ find /var/lib/pulp/content -type d -perm -g-s -exec chmod g+s {} \;")
-      execute!('find /var/lib/pulp/content -type d -perm -g-s -exec chmod g+s {} \;')
-      spinner.update('$ chown -R :pulp /var/lib/pulp/content')
+      spinner.update("# find /var/lib/pulp/content -type d \! -perm -g+s -exec chmod g+s {} +")
+      execute!('find /var/lib/pulp/content -type d \! -perm -g+s -exec chmod g+s {} +')
+      spinner.update('# chgrp -R pulp /var/lib/pulp/content')
       FileUtils.chown_R nil, 'pulp', '/var/lib/pulp/content'
     end
   end

data/definitions/procedures/restore/regenerate_queues.rb

@@ -2,7 +2,7 @@ module Procedures::Restore
   class RegenerateQueues < ForemanMaintain::Procedure
     metadata do
       advanced_run false
-      description 'Regenerate required activemq and qpidd queues while restoring online backup'
+      description 'Regenerate required activemq and/or qpidd queues while restoring online backup'
       confine do
         feature(:pulp2)
       end
@@ -31,7 +31,7 @@ module Procedures::Restore
 
     def run
       with_spinner('Resetting the queues') do |spinner|
-        regenerate_activemq_queues(spinner)
+        regenerate_activemq_queues(spinner) if feature(:candlepin)
         regenerate_qpidd_queues(spinner)
         spinner.update('Queues created successfully')
       end

data/definitions/scenarios/upgrade_to_capsule_6_10.rb

@@ -0,0 +1,88 @@
+module Scenarios::Capsule_6_10
+  class Abstract < ForemanMaintain::Scenario
+    def self.upgrade_metadata(&block)
+      metadata do
+        tags :upgrade_scenario
+        confine do
+          feature(:capsule) &&
+            (feature(:capsule).current_minor_version == '6.9' || \
+            ForemanMaintain.upgrade_in_progress == '6.10')
+        end
+        instance_eval(&block)
+      end
+    end
+
+    def target_version
+      '6.10'
+    end
+  end
+
+  class PreUpgradeCheck < Abstract
+    upgrade_metadata do
+      description 'Checks before upgrading to Capsule 6.10'
+      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.10'))
+    end
+  end
+
+  class PreMigrations < Abstract
+    upgrade_metadata do
+      description 'Procedures before migrating to Capsule 6.10'
+      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 Capsule 6.10'
+      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.10'))
+      add_step(Procedures::Packages::UnlockVersions.new)
+      add_step(Procedures::Packages::Update.new(:assumeyes => true))
+      add_step_with_context(Procedures::Installer::Upgrade)
+    end
+  end
+
+  class PostMigrations < Abstract
+    upgrade_metadata do
+      description 'Procedures after migrating to Capsule 6.10'
+      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 Capsule 6.10'
+      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

data/definitions/scenarios/upgrade_to_capsule_6_10_z.rb

@@ -0,0 +1,88 @@
+module Scenarios::Capsule_6_10_z
+  class Abstract < ForemanMaintain::Scenario
+    def self.upgrade_metadata(&block)
+      metadata do
+        tags :upgrade_scenario
+        confine do
+          feature(:capsule) &&
+            (feature(:capsule).current_minor_version == '6.10' || \
+              ForemanMaintain.upgrade_in_progress == '6.10.z')
+        end
+        instance_eval(&block)
+      end
+    end
+
+    def target_version
+      '6.10.z'
+    end
+  end
+
+  class PreUpgradeCheck < Abstract
+    upgrade_metadata do
+      description 'Checks before upgrading to Capsule 6.10.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.10'))
+    end
+  end
+
+  class PreMigrations < Abstract
+    upgrade_metadata do
+      description 'Procedures before migrating to Capsule 6.10.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 Capsule 6.10.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.10'))
+      add_step(Procedures::Packages::UnlockVersions.new)
+      add_step(Procedures::Packages::Update.new(:assumeyes => true))
+      add_step_with_context(Procedures::Installer::Upgrade)
+    end
+  end
+
+  class PostMigrations < Abstract
+    upgrade_metadata do
+      description 'Procedures after migrating to Capsule 6.10.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 Capsule 6.10.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

data/definitions/scenarios/upgrade_to_satellite_6_10.rb

@@ -0,0 +1,90 @@
+module Scenarios::Satellite_6_10
+  class Abstract < ForemanMaintain::Scenario
+    def self.upgrade_metadata(&block)
+      metadata do
+        tags :upgrade_scenario
+        confine do
+          feature(:satellite) &&
+            (feature(:satellite).current_minor_version == '6.9' || \
+            ForemanMaintain.upgrade_in_progress == '6.10')
+        end
+        instance_eval(&block)
+      end
+    end
+
+    def target_version
+      '6.10'
+    end
+  end
+
+  class PreUpgradeCheck < Abstract
+    upgrade_metadata do
+      description 'Checks before upgrading to Satellite 6.10'
+      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::Foreman::CheckpointSegments)
+      add_step(Checks::Repositories::Validate.new(:version => '6.10'))
+    end
+  end
+
+  class PreMigrations < Abstract
+    upgrade_metadata do
+      description 'Procedures before migrating to Satellite 6.10'
+      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.10'
+      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.10'))
+      add_step(Procedures::Packages::UnlockVersions.new)
+      add_step(Procedures::Packages::Update.new(:assumeyes => true))
+      add_step_with_context(Procedures::Installer::Upgrade)
+      add_step(Procedures::Installer::UpgradeRakeTask)
+    end
+  end
+
+  class PostMigrations < Abstract
+    upgrade_metadata do
+      description 'Procedures after migrating to Satellite 6.10'
+      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.10'
+      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

data/definitions/scenarios/upgrade_to_satellite_6_10_z.rb

@@ -0,0 +1,89 @@
+module Scenarios::Satellite_6_10_z
+  class Abstract < ForemanMaintain::Scenario
+    def self.upgrade_metadata(&block)
+      metadata do
+        tags :upgrade_scenario
+        confine do
+          feature(:satellite) &&
+            (feature(:satellite).current_minor_version == '6.10' || \
+            ForemanMaintain.upgrade_in_progress == '6.10.z')
+        end
+        instance_eval(&block)
+      end
+    end
+
+    def target_version
+      '6.10.z'
+    end
+  end
+
+  class PreUpgradeCheck < Abstract
+    upgrade_metadata do
+      description 'Checks before upgrading to Satellite 6.10.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.10'))
+    end
+  end
+
+  class PreMigrations < Abstract
+    upgrade_metadata do
+      description 'Procedures before migrating to Satellite 6.10.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.10.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.10'))
+      add_step(Procedures::Packages::UnlockVersions.new)
+      add_step(Procedures::Packages::Update.new(:assumeyes => true))
+      add_step_with_context(Procedures::Installer::Upgrade)
+      add_step(Procedures::Installer::UpgradeRakeTask)
+    end
+  end
+
+  class PostMigrations < Abstract
+    upgrade_metadata do
+      description 'Procedures after migrating to Satellite 6.10.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.10.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

data/lib/foreman_maintain/package_manager/yum.rb

@@ -71,6 +71,14 @@ module ForemanMaintain::PackageManager
       sys.execute(find_cmd).split("\n")
     end
 
+    def list_installed_packages(queryfm = '%{NAME}-%{VERSION}-%{RELEASE}.%{ARCH}\n')
+      # The queryfm should only include valid tag(s) as per `rpm --querytag` list.
+      # If any special formatting is required with querytag then it should be provided with tag i.e,
+      # querytag = "--%{VENDOR}"
+      # The queryfm string must end with '\n'
+      sys.execute!("rpm -qa --qf '#{queryfm}'").split("\n")
+    end
+
     private
 
     def protector_config

data/lib/foreman_maintain/version.rb

@@ -1,3 +1,3 @@
 module ForemanMaintain
-  VERSION = '0.8.0'.freeze
+  VERSION = '0.8.1'.freeze
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: foreman_maintain
 version: !ruby/object:Gem::Version
-  version: 0.8.0
+  version: 0.8.1
 platform: ruby
 authors:
 - Ivan Nečas
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2021-04-09 00:00:00.000000000 Z
+date: 2021-05-10 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: clamp
@@ -147,6 +147,7 @@ files:
 - definitions/checks/maintenance_mode/check_consistency.rb
 - definitions/checks/mongo/db_up.rb
 - definitions/checks/mongo/tools_installed.rb
+- definitions/checks/non_rh_packages.rb
 - definitions/checks/original_assets.rb
 - definitions/checks/package_manager/yum/validate_yum_config.rb
 - definitions/checks/pulpcore/db_up.rb
@@ -298,10 +299,14 @@ files:
 - definitions/scenarios/prep_6_10_upgrade.rb
 - definitions/scenarios/restore.rb
 - definitions/scenarios/services.rb
+- definitions/scenarios/upgrade_to_capsule_6_10.rb
+- definitions/scenarios/upgrade_to_capsule_6_10_z.rb
 - definitions/scenarios/upgrade_to_capsule_6_8.rb
 - definitions/scenarios/upgrade_to_capsule_6_8_z.rb
 - definitions/scenarios/upgrade_to_capsule_6_9.rb
 - definitions/scenarios/upgrade_to_capsule_6_9_z.rb
+- definitions/scenarios/upgrade_to_satellite_6_10.rb
+- definitions/scenarios/upgrade_to_satellite_6_10_z.rb
 - definitions/scenarios/upgrade_to_satellite_6_2.rb
 - definitions/scenarios/upgrade_to_satellite_6_2_z.rb
 - definitions/scenarios/upgrade_to_satellite_6_3.rb