katello 3.17.0 → 3.17.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 45f65da0c274cbc6976755a23d58f5eb77979dceea6cdcb118c1d6445f20b8ad
-  data.tar.gz: c5c8d2e9e58744b2389f9910daadc9656040d37364edfb12f48f5f1f06bf1743
+  metadata.gz: d4911d03477352b7d0d1f70c1fe0aabf89a4203f925d11b06b09fb753cca4119
+  data.tar.gz: 0442bdaf70ac3842ccae4d639111cdbefabb4d3c6601292c789fd7184e4273d0
 SHA512:
-  metadata.gz: 5ac6853c42e650e0a410e0f60b5c5a5f58d6d046142fb846fd39a37124a1a43222d0d22377881cf111c3a7984454ddc937f0fc0eeef6b5fb08fc3ac61630b80e
-  data.tar.gz: 0c87277e1d4a316b374c2f30b86154a607e4619ee5069c1157f0fe3aa07126e6645591e7eba301eca661b230892f66c7d0bc21c3446ea4fb262b1622c8c4865e
+  metadata.gz: 93f259c486b6f6d766389c062a894ca2a77e46cebe0fa9d4b6cb00d3722cefbeffefc46d0836c4bfcb08979206517d1e586e10ae5de0b22049798f060626b32f
+  data.tar.gz: 61b4ea0699d961668d15ff3235d67e4bb8bb30e987166a8a8cf6a00444a827b19d63665842fccf3f65539e28ddf46c277b4b0c070321b6cfe4254921b483e629

data/app/lib/actions/katello/applicability/hosts/bulk_generate.rb

@@ -9,8 +9,12 @@ module Actions
 
           def run
             input[:host_ids].each do |host_id|
-              content_facet = ::Host.find(host_id).content_facet
-              content_facet.calculate_and_import_applicability
+              content_facet = ::Katello::Host::ContentFacet.find_by_host_id(host_id)
+              if content_facet.present?
+                content_facet.calculate_and_import_applicability
+              else
+                Rails.logger.warn(_("Content Facet for host with id %s is non-existent. Skipping applicability calculation.") % host_id)
+              end
             end
           end
 

data/app/lib/actions/katello/host/hypervisors_update.rb

@@ -13,6 +13,8 @@ module Actions
           @hypervisors = input[:hypervisors]
           return unless @hypervisors
 
+          @duplicate_uuid_hypervisors = {}
+
           User.as_anonymous_admin do
             ActiveRecord::Base.transaction do
               load_resources
@@ -30,8 +32,16 @@ module Actions
               update_facts(uuid, host)
             end
           end
+
+          @duplicate_uuid_hypervisors.each do |hypervisor, existing_host|
+            fail _("Host creation was skipped for %s because it shares a BIOS UUID with %s. " \
+                   "To report this hypervisor, override its dmi.system.uuid fact or set 'candlepin.use_system_uuid_for_matching' " \
+                   "to 'true' in the Candlepin configuration." % [hypervisor[:name], existing_host.name])
+          end
         end
 
+        private
+
         def load_hosts_guests
           @hosts.each do |uuid, host|
             host.subscription_facet ||= host.build_subscription_facet(uuid: uuid)
@@ -81,6 +91,14 @@ module Actions
           @hypervisors.each do |hypervisor|
             next if @hosts.key?(hypervisor[:uuid])
 
+            created_host = new_hypervisors[hypervisor[:uuid]]
+            if created_host
+              # we've already created a host record for this duplicate hypervisor
+              # track it so we can message later, and continue processing the remaining hypervisors
+              @duplicate_uuid_hypervisors[hypervisor] = created_host
+              next
+            end
+
             duplicate_name, org = duplicate_name(hypervisor, @candlepin_attributes[hypervisor[:uuid]])
             new_hypervisors[hypervisor[:uuid]] = create_host_for_hypervisor(duplicate_name, org)
           end

data/app/lib/actions/pulp3/content_view/delete_repository_references.rb

@@ -14,7 +14,7 @@ module Actions
           content_view.repository_references.each do |repository_reference|
             repo = repository_reference.root_repository.library_instance
             #force pulp3 in case we've done migrations, but haven't switched over yet
-            tasks << repo.backend_service(smart_proxy, true).delete(repository_reference.repository_href)
+            tasks << repo.backend_service(smart_proxy, true).delete_repository(repository_reference)
           end
           content_view.repository_references.destroy_all
 

data/app/lib/actions/pulp3/repository/delete.rb

@@ -8,7 +8,7 @@ module Actions
 
         def invoke_external_task
           repo = ::Katello::Repository.find(input[:repository_id])
-          output[:response] = repo.backend_service(smart_proxy).delete
+          output[:response] = repo.backend_service(smart_proxy).delete_repository
         end
       end
     end

data/app/services/katello/pulp3/repository.rb

@@ -1,5 +1,4 @@
 require "pulpcore_client"
-
 module Katello
   module Pulp3
     class Repository
@@ -188,8 +187,9 @@ module Katello
         api.repositories_api.read(repository_reference.try(:repository_href))
       end
 
-      def delete(href = repository_reference.try(:repository_href))
-        repository_reference.try(:destroy)
+      def delete_repository(repo_reference = repository_reference)
+        href = repo_reference.try(:repository_href)
+        repo_reference.try(:destroy)
         ignore_404_exception { api.repositories_api.delete(href) } if href
       end
 

data/app/services/katello/pulp3/repository/yum.rb

@@ -159,8 +159,7 @@ module Katello
 
             data_dup.config[i][:content] = leftover_units.pop(copy_amount)
             unit_copy_counter += copy_amount
-            # Do copy call if limit is reached or if we're under the limit but on the last repo config.
-            if unit_copy_counter >= UNIT_LIMIT || (i == data_dup.config.size - 1 && leftover_units.empty?)
+            if unit_copy_counter != 0
               tasks << api.copy_api.copy_content(data_dup)
               unit_copy_counter = 0
             end

data/lib/katello/version.rb

@@ -1,3 +1,3 @@
 module Katello
-  VERSION = "3.17.0".freeze
+  VERSION = "3.17.1".freeze
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: katello
 version: !ruby/object:Gem::Version
-  version: 3.17.0
+  version: 3.17.1
 platform: ruby
 authors:
 - N/A
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2020-11-06 00:00:00.000000000 Z
+date: 2020-12-02 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails