foreman_maintain 1.13.2 → 1.13.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: cd6af58e1ff23c52090fa5bd746f974222ae8eae42d037fe44867ffc658032eb
-  data.tar.gz: 0f5431edfc192eafc479ca56ab3b6b72ae5acd5db96c21e537b374360793185c
+  metadata.gz: 4082c169b1eb743083f6ecb900baede1873b61864734ed3257a3a7f0c95836fc
+  data.tar.gz: f6232f0d970880abbd3ede420d46afef364c1026b75a4503d06e25265a3b2c5f
 SHA512:
-  metadata.gz: 34e2db0dc990b45ef1b5136a9724bf7c44b8e51e6afbbd35c1968648fd817de233b4aeed3d06d5b1563e7d0865b32906e0e8acc62522e86e1cd9d72e15a3fad5
-  data.tar.gz: 46ffdb71d69ef7f4e681bbf778cffc7cef9e70f80cf4117313226e395c05f26c7b8708544742965e2d2b54dd918e11f5afeb2bb9c53ccc3ccbe3e2b224a543ab
+  metadata.gz: 5c395bf50959d58e4a31d79a9238986f78dad6d24ad433c11a66f0630921b3646a292334331ae27a8765bc048371dd82bc33bb6ca94c8ea27aad2190a28476cd
+  data.tar.gz: 77c15f1caec28991de6b3123c201ae5c5235f26a397657f6e133dc35f84e3a2c2b9cad6557b4bbc8b458079feb56b857ba4daa49bf9db5c0b4dcece2bd58dc7a

data/definitions/procedures/pulpcore/rpm_datarepair.rb

@@ -0,0 +1,17 @@
+module Procedures::Pulpcore
+  class RpmDatarepair < ForemanMaintain::Procedure
+    include ForemanMaintain::Concerns::PulpCommon
+
+    metadata do
+      description 'Rename ContentArtifact relative_paths to match `{N-V-R.A.rpm}`'
+      for_feature :pulpcore
+    end
+
+    def run
+      with_spinner('Running pulpcore-manager rpm-datarepair 4073') do
+        # Assumption: services are already started
+        execute!(pulpcore_manager('rpm-datarepair 4073'))
+      end
+    end
+  end
+end

data/definitions/scenarios/foreman_upgrade.rb

@@ -38,7 +38,6 @@ module Scenarios::Foreman
         Checks::CheckUpstreamRepository,
         Checks::Disk::AvailableSpace,
         Checks::Disk::AvailableSpaceCandlepin, # if candlepin
-        Checks::Disk::AvailableSpacePostgresql13,
         Checks::Disk::PostgresqlMountpoint,
         Checks::Foreman::ValidateExternalDbVersion, # if external database
         Checks::Foreman::CheckExternalDbEvrPermissions, # if external database
@@ -54,7 +53,6 @@ module Scenarios::Foreman
         Checks::NonRhPackages,
         Checks::PackageManager::Dnf::ValidateDnfConfig,
         Checks::Repositories::CheckNonRhRepository,
-        Checks::CheckOrganizationContentAccessMode,
         Checks::CheckSha1CertificateAuthority,
         Checks::Repositories::Validate
       )
@@ -113,6 +111,7 @@ module Scenarios::Foreman
       add_steps(
         Procedures::RefreshFeatures,
         Procedures::Service::Start,
+        Procedures::Pulpcore::RpmDatarepair,
         Procedures::Crond::Start,
         Procedures::Timer::Start,
         Procedures::SyncPlans::Enable,

data/definitions/scenarios/satellite_upgrade.rb

@@ -55,8 +55,6 @@ module Scenarios::Satellite
         Checks::PackageManager::Dnf::ValidateDnfConfig,
         Checks::Repositories::CheckNonRhRepository,
         Checks::CheckIpv6Disable,
-        Checks::Disk::AvailableSpacePostgresql13,
-        Checks::CheckOrganizationContentAccessMode,
         Checks::CheckSha1CertificateAuthority,
         Checks::Repositories::Validate.new(:version => target_version),
       )
@@ -117,6 +115,7 @@ module Scenarios::Satellite
       add_steps(
         Procedures::RefreshFeatures,
         Procedures::Service::Start,
+        Procedures::Pulpcore::RpmDatarepair,
         Procedures::Crond::Start,
         Procedures::Timer::Start,
         Procedures::SyncPlans::Enable,

data/lib/foreman_maintain/concerns/downstream.rb

@@ -21,8 +21,16 @@ module ForemanMaintain
           execute!(%(subscription-manager register #{org_options}\
                       --activationkey #{shellescape(activation_key)} --force))
         else
+          had_utils_enabled = repository_manager.enabled_repos.keys.any? do |r|
+            r.start_with?("satellite-utils-")
+          end
+
           repository_manager.rhsm_disable_repos(['*'])
-          repository_manager.rhsm_enable_repos(rh_repos(version))
+
+          repos = rh_repos(version)
+          repos << utils_repo(version) if had_utils_enabled
+
+          repository_manager.rhsm_enable_repos(repos)
         end
       end
 
@@ -64,6 +72,12 @@ module ForemanMaintain
 
       private
 
+      def utils_repo(server_version)
+        server_version = version(server_version)
+        full_version   = "#{server_version.major}.#{server_version.minor}"
+        "satellite-utils-#{full_version}-for-rhel-#{el_major_version}-x86_64-rpms"
+      end
+
       def satellite_maintain_config
         if File.exist?(SATELLITE_MAINTAIN_CONFIG)
           YAML.load_file(SATELLITE_MAINTAIN_CONFIG)

data/lib/foreman_maintain/version.rb

@@ -1,3 +1,3 @@
 module ForemanMaintain
-  VERSION = '1.13.2'.freeze
+  VERSION = '1.13.3'.freeze
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: foreman_maintain
 version: !ruby/object:Gem::Version
-  version: 1.13.2
+  version: 1.13.3
 platform: ruby
 authors:
 - Ivan Nečas
@@ -165,7 +165,6 @@ files:
 - definitions/checks/container/podman_login.rb
 - definitions/checks/disk/available_space.rb
 - definitions/checks/disk/available_space_candlepin.rb
-- definitions/checks/disk/available_space_postgresql13.rb
 - definitions/checks/disk/performance.rb
 - definitions/checks/disk/postgresql_mountpoint.rb
 - definitions/checks/env_proxy.rb
@@ -206,7 +205,6 @@ files:
 - definitions/checks/restore/validate_interfaces.rb
 - definitions/checks/restore/validate_postgresql_dump_permissions.rb
 - definitions/checks/root_user.rb
-- definitions/checks/sca_only.rb
 - definitions/checks/server_ping.rb
 - definitions/checks/services_up.rb
 - definitions/checks/system_registration.rb
@@ -297,6 +295,7 @@ files:
 - definitions/procedures/packages/update.rb
 - definitions/procedures/packages/update_all_confirmation.rb
 - definitions/procedures/pulpcore/container_handle_image_metadata.rb
+- definitions/procedures/pulpcore/rpm_datarepair.rb
 - definitions/procedures/pulpcore/wait_for_tasks.rb
 - definitions/procedures/puppet/delete_empty_ca_cert_request_files.rb
 - definitions/procedures/puppet/remove_puppet.rb

data/definitions/checks/disk/available_space_postgresql13.rb

@@ -1,42 +0,0 @@
-module Checks
-  module Disk
-    class AvailableSpacePostgresql13 < ForemanMaintain::Check
-      metadata do
-        label :available_space_for_postgresql13
-        description 'Check to make sure PostgreSQL 13 work directory has enough space for upgrade'
-        confine do
-          feature(:instance).postgresql_local?
-        end
-      end
-
-      def run
-        assert(psql_13_available_space >= psql_12_consumed_space, warning_message)
-      end
-
-      def pgsql_dir(version)
-        case version
-        when 12
-          '/var/lib/pgsql/data'
-        when 13
-          '/var/lib/pgsql'
-        end
-      end
-
-      def psql_12_consumed_space
-        io_obj = ForemanMaintain::Utils::Disk::IODevice.new(pgsql_dir(12))
-        io_obj.space_used
-      end
-
-      def psql_13_available_space
-        io_obj = ForemanMaintain::Utils::Disk::IODevice.new(pgsql_dir(13))
-        io_obj.available_space
-      end
-
-      def warning_message
-        "PostgreSQL will be upgraded from 12 to 13. \n" \
-        "During the upgrade a backup is created in /var/lib/pgsql/data-old and requires " \
-        "at least #{psql_12_consumed_space} MiB free space."
-      end
-    end
-  end
-end

data/definitions/checks/sca_only.rb

@@ -1,56 +0,0 @@
-class Checks::CheckOrganizationContentAccessMode < ForemanMaintain::Check
-  metadata do
-    label :check_organization_content_access_mode
-    description 'Check if any organizations are using entitlement mode'
-
-    confine do
-      feature(:katello)
-    end
-  end
-
-  def run
-    doc_link = "https://access.redhat.com/articles/simple-content-access"
-
-    with_spinner('Checking organization content access modes') do
-      output = execute_org_check
-      orgs_to_migrate = parse_orgs_to_migrate(output)
-
-      assert(
-        orgs_to_migrate.empty?,
-        "\nThe following organizations are using entitlement mode:\n"\
-        "#{format_orgs_to_migrate(orgs_to_migrate)}\n\n"\
-        "As of Satellite 6.16, entitlement mode is removed, and these organizations"\
-        " will be automatically migrated to Simple Content Access during the upgrade."\
-        " Please ensure that you have reviewed the documentation and are prepared for this change."\
-        " Documentation for SCA mode is available at #{doc_link}"
-      )
-    end
-  end
-
-  private
-
-  # rubocop:disable Lint/InterpolationCheck
-  def execute_org_check
-    execute!(
-      'echo "Organization.all.each ' \
-      '{ |org| puts \"NONSCA: #{org.name}\" unless org.simple_content_access? }" ' \
-      '| foreman-rake console'
-    )
-  end
-  # rubocop:enable Lint/InterpolationCheck
-
-  def parse_orgs_to_migrate(output)
-    orgs = []
-    output.each_line do |line|
-      match = line.match(/NONSCA: (.+)/)
-      if match && !match[1].strip.start_with?('#{org.name}') # rubocop:disable Lint/InterpolationCheck
-        orgs << match[1].strip
-      end
-    end
-    orgs
-  end
-
-  def format_orgs_to_migrate(orgs_to_migrate)
-    orgs_to_migrate.join("\n")
-  end
-end