katello 2.4.0 → 2.4.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 8647c42c72655d45ce3cf7f9bda72dc62c401c48
-  data.tar.gz: c6709516499c7a7c96844293f54c351c43ff4824
+  metadata.gz: 71f002d889e1ed307d9a97f9cc97266659b04591
+  data.tar.gz: 699bcc1ee8187e27816ef953d3b3a471e0820481
 SHA512:
-  metadata.gz: 8936bc4233c21f4c3bbc180a2d97bda511cbd4fd217808a1f1fffe3b6fcba9ad63eab895168932a2520b91a56bce3d12e9e4809b8ba43e09f21ec00d1e6a4339
-  data.tar.gz: 44fccd68dee21eb6cc317de904c674bf2dd7e766ea3e0bb16b24624e66c3f8eb71b111f206f3fc29dd49f9e2c21b67bb11f94ac04cb0533ef90a2b63f20712b6
+  metadata.gz: 8b2912f0372097ecb9364fbcdf0d4d7a8d62f46458a272b6bd0bc5f2ed849266283ef23b45f270e0ab568e60fe0cb3e159b21eb7cad604b09c9b740fa5f12f1f
+  data.tar.gz: 403cb22a72f122040550fdf5a309bf4e260545014c19ba8015126813c20e6127ff358866245bd57168a2e2d038ba53f0f4712a6ac1aaa5743962d8662b16d749

data/app/lib/actions/katello/content_view_version/incremental_update.rb

@@ -167,28 +167,33 @@ module Actions
           copy_outputs
         end
 
-        def puppet_module_names(uuids)
-          ::Katello::PuppetModule.id_search(uuids).map(&:name)
+        def puppet_module_names(ids)
+          find_puppet_modules(ids).pluck(:name).uniq
         end
 
         def remove_puppet_names(repo, names)
           plan_action(Pulp::Repository::RemovePuppetModule, :pulp_id => repo.pulp_id, :clauses => {:unit => {:name => {'$in' => names}}})
         end
 
-        def copy_puppet_content(new_repo, puppet_module_uuids)
+        def copy_puppet_content(new_repo, puppet_module_ids)
           copy_outputs = []
-          unless puppet_module_uuids.blank?
-            remove_puppet_names(new_repo, puppet_module_names(puppet_module_uuids))
-            copy_outputs = puppet_module_uuids.map { |uuid| copy_puppet_module(new_repo, uuid).output }
+          unless puppet_module_ids.blank?
+            remove_puppet_names(new_repo, puppet_module_names(puppet_module_ids))
+            copy_outputs = puppet_module_ids.map { |module_id| copy_puppet_module(new_repo, module_id).output }
             plan_action(Pulp::ContentViewPuppetEnvironment::IndexContent, id: new_repo.id)
           end
           copy_outputs
         end
 
-        def copy_puppet_module(new_repo, uuid)
-          possible_repos = ::Katello::PuppetModule.find(uuid).repositories.in_organization(new_repo.organization).in_default_view
+        def find_puppet_modules(ids)
+          ::Katello::PuppetModule.with_identifiers(ids)
+        end
+
+        def copy_puppet_module(new_repo, module_id)
+          puppet_module = find_puppet_modules([module_id]).first
+          possible_repos = puppet_module.repositories.in_organization(new_repo.organization).in_default_view
           plan_action(Pulp::Repository::CopyPuppetModule, :source_pulp_id => possible_repos.first.pulp_id,
-                    :target_pulp_id => new_repo.pulp_id, :clauses =>  {'unit_id' => uuid}, :include_result => true)
+                    :target_pulp_id => new_repo.pulp_id, :clauses =>  {'unit_id' => puppet_module.uuid}, :include_result => true)
         end
 
         def plan_copy(action_class, source_repo, target_repo, clauses = nil, override_config = nil)

data/app/models/katello/activation_key.rb

@@ -19,7 +19,7 @@ module Katello
     has_many :systems, :through => :system_activation_keys
 
     has_many :pools, :through => :pool_activation_keys, :class_name => "Katello::Pool"
-    has_many :pool_activation_keys, :class_name => "Katello::PoolActivationKey", :dependent => :destroy, :inverse_of => :activation_keys
+    has_many :pool_activation_keys, :class_name => "Katello::PoolActivationKey", :dependent => :destroy, :inverse_of => :activation_key
 
     before_validation :set_default_content_view, :unless => :persisted?
 

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

@@ -64,10 +64,11 @@ module Katello
         lifecycle_environment = host.lifecycle_environment
 
         if content_view && lifecycle_environment
-          Katello::Repository.where(:distribution_version => host.os.release,
-                                    :distribution_arch => host.architecture.name,
-                                    :distribution_bootable => true
-                                    )
+          Katello::Repository.in_environment(lifecycle_environment).in_content_views([content_view]).
+              where(:distribution_version => host.os.release,
+                    :distribution_arch => host.architecture.name,
+                    :distribution_bootable => true
+                   )
         else
           []
         end

data/app/models/katello/content_view_history.rb

@@ -42,13 +42,15 @@ module Katello
     end
 
     def humanized_action
-      case self.task.label
+      case self.task.try(:label)
       when "Actions::Katello::ContentView::Publish"
         _("Published new version")
       when "Actions::Katello::ContentView::Promote"
         _("Promoted to %{environment}") % { :environment => self.environment.name }
       when "Actions::Katello::ContentView::Remove"
         _("Deleted from %{environment}") % { :environment => self.environment.name }
+      else
+        _("Unknown Action")
       end
     end
 

data/app/models/katello/glue/candlepin/consumer.rb

@@ -408,16 +408,8 @@ module Katello
       end
 
       def products
-        all_products = []
-
-        self.entitlements.each do |entitlement|
-          pool = Katello::Pool.find_by_cp_id(entitlement['pool']['id'])
-          Katello::Product.where(:cp_id => pool.product_id).each do |product|
-            all_products << product
-          end
-        end
-
-        return all_products
+        pool_ids = self.entitlements.map { |entitlement| entitlement['pool']['id'] }
+        Katello::Product.joins(:subscriptions => :pools).where("#{Katello::Pool.table_name}.cp_id" => pool_ids).enabled.uniq
       end
 
       def find_entitlement(pool_id)

data/app/models/katello/repository.rb

@@ -121,7 +121,7 @@ module Katello
     end
 
     def self.in_organization(org)
-      where(:environment_id => org.kt_environments)
+      where("#{Repository.table_name}.environment_id" => org.kt_environments.pluck("#{KTEnvironment.table_name}.id"))
     end
 
     def self.in_environment(env_id)

data/config/katello.yml

@@ -15,6 +15,8 @@
 # and development environments. Values can be overridden bellow.
 #
 common:
+  ssl_client_key: '/etc/pki/katello/private/abed.usersys.redhat.com-pulp-client.key'
+  ssl_client_cert: '/etc/pki/katello/certs/abed.usersys.redhat.com-pulp-client.crt'
   use_cp: # set to true/false if you want to override default
   use_pulp: # set to true/false if you want to override default
   use_elasticsearch: # set to true/false if you want to override default

data/lib/katello/version.rb

@@ -1,3 +1,3 @@
 module Katello
-  VERSION = "2.4.0"
+  VERSION = "2.4.1"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: katello
 version: !ruby/object:Gem::Version
-  version: 2.4.0
+  version: 2.4.1
 platform: ruby
 authors:
 - N/A
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-12-23 00:00:00.000000000 Z
+date: 2016-03-11 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails