katello 3.13.1 → 3.13.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: fffaa8a0526b0aebf3579586d7b093f10024d6f9db1f181d26eba976d2a08dbd
-  data.tar.gz: 804ff8b52e48b758f7da0980e3b7409a05ccbf372b9feab000917c9f5c0830f2
+  metadata.gz: 8c5b6c6608f07015895a301db87b3921050b0d2e1982f24e7bb772f48ebb986b
+  data.tar.gz: 1bde260d489d40d422b97523c672cd543a7c1caeb3ae3ea93800ff61407b5786
 SHA512:
-  metadata.gz: 37bee683b2faa62bd1c3b47f7f0b8f1023293aa5dd3d1b1f4cfb4a451551184e6553730f38dffa47d2cc003e508453197d81f792c8adc6c9d682c718f884bbcb
-  data.tar.gz: 3a82db81d710266ead4f21fc725acf782cbb0b43b9e3a6c2c5ca04e32a826316225a2af5145153edc1277e920f5b366def5a55184ed9ae296f8d2e66d22728fe
+  metadata.gz: b318b92c158a02013b8f20dca2cb9c0560e8695bdeb1df89c959754df0970ca55bee491f6dccc073d358fd7b9f242f6174472754e0a2da4d396a3593bd29a2e0
+  data.tar.gz: bb01b642b56e725d4bc28d5e6bca91c5cfaaaec87236133c7bb1d45b618008a9a6e11018a1bfac22fe85718b3670f86f23137600607b5d86433043f7abe23ec4

data/app/lib/actions/katello/content_view/publish.rb

@@ -76,6 +76,9 @@ module Actions
               attrs[:metadata] = metadata
             end
           end
+
+          output[:content_view_id] = input[:content_view_id]
+          output[:content_view_version_id] = input[:content_view_version_id]
         end
 
         def rescue_strategy_for_self

data/app/lib/actions/katello/repository/filtered_index_content.rb

@@ -20,6 +20,7 @@ module Actions
           elsif repo.file?
             ::Katello::FileUnit.import_for_repository(repo)
           elsif repo.deb?
+            unit_ids = search_units(repo)
             ::Katello::Deb.import_all(unit_ids, repo)
           elsif repo.yum?
             unit_ids = search_units(repo)

data/app/models/katello/concerns/host_managed_extensions.rb

@@ -79,6 +79,10 @@ module Katello
         self.organization.label
       end
 
+      def rhsm_fact_values
+        self.fact_values.joins(:fact_name).where("#{::FactName.table_name}.type = '#{Katello::RhsmFactName}'")
+      end
+
       def self.available_locks
         [:update]
       end

data/app/models/katello/host/subscription_facet.rb

@@ -212,9 +212,27 @@ module Katello
         return if host.build? || rhsm_facts.nil?
         rhsm_facts[:_type] = RhsmFactName::FACT_TYPE
         rhsm_facts[:_timestamp] = Time.now.to_s
+        if ignore_os?(host.operatingsystem, rhsm_facts)
+          rhsm_facts[:ignore_os] = true
+        end
         host.import_facts(rhsm_facts)
       end
 
+      def self.ignore_os?(host_os, rhsm_facts)
+        if host_os.nil?
+          return false
+        end
+
+        name = rhsm_facts['distribution.name']
+        version = rhsm_facts['distribution.version']
+        major, minor = version.split('.')
+        return host_os.name == 'CentOS' &&
+          !host_os.major.nil? &&
+          name == 'CentOS' &&
+          minor.blank? &&
+          host_os.major == major
+      end
+
       def self.propose_name_from_facts(facts)
         setting_fact = Setting[:register_hostname_fact]
         if !setting_fact.blank? && facts[setting_fact] && facts[setting_fact] != 'localhost'

data/app/models/katello/pool.rb

@@ -22,6 +22,7 @@ module Katello
     include Glue::Candlepin::CandlepinObject
 
     scoped_search :on => :cp_id, :complete_value => true, :rename => :id, :only_explicit => true
+    scoped_search :on => :upstream_pool_id, :complete_value => true, :only_explicit => true
     scoped_search :on => :quantity, :complete_value => true, :validator => ScopedSearch::Validators::INTEGER, :only_explicit => true
     scoped_search :on => :start_date, :complete_value => true, :rename => :starts, :only_explicit => true
     scoped_search :on => :end_date, :complete_value => true, :rename => :expires, :only_explicit => true

data/app/models/katello/rhsm_fact_parser.rb

@@ -53,8 +53,14 @@ module Katello
 
       os_name = ::Katello::Candlepin::Consumer.distribution_to_puppet_os(name)
       major, minor = version.split('.')
-      if os_name && !invalid_centos_os?(os_name, minor)
-        os_attributes = {:major => major, :minor => minor || '', :name => os_name, :release_name => os_release_name(os_name)}
+      unless facts['ignore_os']
+        os_attributes = {:major => major, :minor => minor || '', :name => os_name}
+
+        release_name = os_release_name(os_name)
+        if release_name
+          os_attributes[:release_name] = release_name
+        end
+
         ::Operatingsystem.find_by(os_attributes) || ::Operatingsystem.create!(os_attributes)
       end
     end
@@ -65,10 +71,6 @@ module Katello
       end
     end
 
-    def invalid_centos_os?(name, minor_version)
-      name == 'CentOS' && minor_version.blank?
-    end
-
     #required to be defined, even if they return nil
     def domain
     end

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

@@ -52,7 +52,7 @@ module Katello
         end
 
         def distributors_to_publish(_options)
-          if repo.clone && !repo.master?
+          if repo.clone && !repo.master? && smart_proxy.pulp_master?
             source_service = repo.target_repository.backend_service(smart_proxy)
             source_distributor_id = source_service.lookup_distributor_id(Runcible::Models::YumDistributor.type_id)
             {Runcible::Models::YumCloneDistributor => {source_repo_id: repo.target_repository.pulp_id,

data/app/services/katello/registration_manager.rb

@@ -296,6 +296,8 @@ module Katello
         host.get_status(::Katello::SubscriptionStatus).destroy
         host.get_status(::Katello::TraceStatus).destroy
         host.installed_packages.delete_all
+
+        host.rhsm_fact_values.destroy_all
       end
     end
   end

data/lib/katello/version.rb

@@ -1,3 +1,3 @@
 module Katello
-  VERSION = "3.13.1".freeze
+  VERSION = "3.13.2".freeze
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: katello
 version: !ruby/object:Gem::Version
-  version: 3.13.1
+  version: 3.13.2
 platform: ruby
 authors:
 - N/A
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2019-10-16 00:00:00.000000000 Z
+date: 2019-11-05 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails