katello 3.15.1 → 3.15.1.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: d0e59e380081b85056d0babdeff1cc1bf1922da00e775bf2636c8d77217a1056
-  data.tar.gz: 23b423ff8b50a973affd765cd9f44c5ca2ae9581539dfb5858918f16b8962092
+  metadata.gz: 198db45b1663ec5e4dd73cb999c9ef4860660fe9ca3428293d0c82ea45ff78a2
+  data.tar.gz: c541eaa6a075bf545ba668d2b80197375428a55047852ca7a4a8fddd2ac7f0cb
 SHA512:
-  metadata.gz: 73817fdabb0fdb4d47dd1f295858b38778dad330ad29e1b54a06c0365916217a88f421ed2cf9fa24e4f6d4ea62314a554428029879cb3b3201e38c5d7c2a957e
-  data.tar.gz: 210ad0aa94dfc1d1528d4430051f7d43642b85882761ebc9016eb24c81ef1b4170934f411635dccfa2f2fd2ee100e1878089267519af013353291406e1397357
+  metadata.gz: 54851ee1cbf1de239a68264f377b4b96e58b310e656b67daed646927aa56bfbc6f6bdf307dc6f4a1240982675a98d2a05bf4d2991b9dae8dc5b829f0d897a4c2
+  data.tar.gz: e8466a953f3bedaa7f761f353fdddf8c858dbe9b09b72dcd338c5a2a132745f9b923e2ba1afdd6e4c2a4fd71fafc2bcb1bc88332866c0d6b08930b9c37246d69

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

@@ -33,16 +33,42 @@ module Actions
           Dynflow::Action::Rescue::Skip
         end
 
+        def self.upload_modules_to_pulp(available_streams, host)
+          query_name_streams = available_streams.map do |profile|
+            ::Katello::ModuleStream.where(profile.slice(:name, :stream))
+          end
+
+          query_name_streams = query_name_streams.inject(&:or)
+
+          bound_library_instances = host.content_facet.bound_repositories.map(&:library_instance_or_self)
+          query = ::Katello::ModuleStream.in_repositories(bound_library_instances).
+                                          select(:name, :stream, :version, :context, :arch).
+                                            merge(query_name_streams)
+
+          updated_profiles = query.map do |module_stream|
+            module_stream.slice(:name, :stream, :version, :context, :arch)
+          end
+
+          # We also need to pass module streams that are not found in the ModuleStream table
+          # but are present on the content host
+          unassociated_profiles = available_streams.select do |profile|
+            updated_profiles.none? { |p| p[:name] == profile[:name] && p[:stream] == profile[:stream] }
+          end
+
+          ::Katello::Pulp::Consumer.new(host.content_facet.uuid).
+              upload_module_stream_profile(updated_profiles + unassociated_profiles)
+        rescue RestClient::ResourceNotFound
+          Rails.logger.warn("Host with ID %s was not known to Pulp, continuing" % host.id)
+        end
+
         def import_module_streams(payload, host)
           enabled_payload = payload.map do |profile|
-            profile.slice("name", "stream", "version", "context", "arch") if profile["status"] == "enabled"
+            profile.slice("name", "stream", "version", "context", "arch").with_indifferent_access if profile["status"] == "enabled"
           end
           enabled_payload.compact!
 
-          ::Katello::Pulp::Consumer.new(host.content_facet.uuid).upload_module_stream_profile(enabled_payload)
+          UploadProfiles.upload_modules_to_pulp(enabled_payload, host)
           host.import_module_streams(payload)
-        rescue RestClient::ResourceNotFound
-          Rails.logger.warn("Host with ID %s was not known to Pulp, continuing" % input[:host_id])
         end
 
         def import_deb_package_profile(host, profile)
@@ -69,6 +95,7 @@ module Actions
             payload = profiles.dig("deb_package_profile", "deb_packages") || []
             import_deb_package_profile(host, payload)
           else
+            module_streams = []
             profiles.each do |profile|
               payload = profile["profile"]
               case profile["content_type"]
@@ -79,9 +106,13 @@ module Actions
               when "enabled_repos"
                 host.import_enabled_repositories(payload)
               else
-                import_module_streams(payload, host)
+                module_streams << payload
               end
             end
+
+            module_streams.each do |module_stream_payload|
+              import_module_streams(module_stream_payload, host)
+            end
           end
         end
       end

data/app/models/katello/repository.rb

@@ -422,8 +422,12 @@ module Katello
       path
     end
 
+    def library_instance_or_self
+      self.library_instance || self
+    end
+
     def generate_repo_path(content_path = nil)
-      _org, _content, content_path = (self.library_instance || self).relative_path.split("/", 3) if content_path.blank?
+      _org, _content, content_path = library_instance_or_self.relative_path.split("/", 3) if content_path.blank?
       content_path = content_path.sub(%r|^/|, '')
       if self.environment
         cve = ContentViewEnvironment.where(:environment_id => self.environment,
@@ -496,7 +500,7 @@ module Katello
         end
       end
       clone = Repository.new(:environment => to_env,
-                     :library_instance => self.library_instance || self,
+                     :library_instance => library_instance_or_self,
                      :root => self.root,
                      :content_view_version => to_version,
                      :saved_checksum_type => checksum_type)

data/db/seeds.d/111-upgrade_tasks.rb

@@ -12,6 +12,7 @@ UpgradeTask.define_tasks(:katello) do
     {:name => 'katello:upgrades:3.12:remove_pulp2_notifier'},
     {:name => 'katello:upgrades:3.13:republish_deb_metadata'},
     {:name => 'katello:upgrades:3.15:set_sub_facet_dmi_uuid'},
-    {:name => 'katello:upgrades:3.15:reindex_rpm_modular'}
+    {:name => 'katello:upgrades:3.15:reindex_rpm_modular'},
+    {:name => 'katello:upgrades:3.16:update_applicable_el8_hosts'}
   ]
 end

data/lib/katello/tasks/upgrades/3.16/update_applicable_el8_hosts.rake

@@ -0,0 +1,29 @@
+namespace :katello do
+  namespace :upgrades do
+    namespace '3.16' do
+      desc <<-DESCRIPTION
+      Update the applicability calculations for Rhel8 hosts.
+      This migration is to be run to address -> https://bugzilla.redhat.com/show_bug.cgi?id=1814095
+      DESCRIPTION
+      task :update_applicable_el8_hosts, [:input_file] => ["environment"] do
+        User.current = User.anonymous_api_admin
+
+        # Find me only those hosts that follow ALL the conditions below
+        # 1) Have a module stream enabled.
+        # 2) Bound to Non Library repositories. (i.e must belong to a CV thats not the default)
+        # 3) Bound repositories must have module streams in them
+        hosts = Host.joins(:content_facet => :content_facet_repositories).
+                 where("#{Host.table_name}.id" => ::Katello::HostAvailableModuleStream.enabled.select(:host_id)).
+                 where("#{Katello::ContentFacetRepository.table_name}.repository_id" =>
+                        ::Katello::Repository.joins(:repository_module_streams).
+                                          in_non_default_view.
+                                          non_archived)
+        hosts.each do |host|
+          available_streams = ::Katello::HostAvailableModuleStream.joins(:available_module_stream).
+                                                enabled.where(:host_id => host).select(:name, :stream)
+          ::Actions::Katello::Host::UploadProfiles.upload_modules_to_pulp(available_streams, host)
+        end
+      end
+    end
+  end
+end

data/lib/katello/version.rb

@@ -1,3 +1,3 @@
 module Katello
-  VERSION = "3.15.1".freeze
+  VERSION = "3.15.1.1".freeze
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: katello
 version: !ruby/object:Gem::Version
-  version: 3.15.1
+  version: 3.15.1.1
 platform: ruby
 authors:
 - N/A
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2020-05-22 00:00:00.000000000 Z
+date: 2020-05-26 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
@@ -4151,6 +4151,7 @@ files:
 - lib/katello/tasks/upgrades/3.13/republish_deb_metadata.rake
 - lib/katello/tasks/upgrades/3.15/reindex_rpm_modular.rake
 - lib/katello/tasks/upgrades/3.15/set_sub_facet_dmi_uuid.rake
+- lib/katello/tasks/upgrades/3.16/update_applicable_el8_hosts.rake
 - lib/katello/tasks/upgrades/3.8/clear_checksum_type.rake
 - lib/katello/tasks/virt_who_report.rake
 - lib/katello/url_constrained_cookie_store.rb