katello 3.2.0.rc3 → 3.2.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: ce99710c536ecdc466fbed467cdb96100f9ddd57
-  data.tar.gz: 2d82b66f5c5f99167da329a7e794b20421fc7933
+  metadata.gz: 983bb2638d8d7bda5fc1c721754d3783b51b2213
+  data.tar.gz: c9c271f48b0a3adc7d40d73a252dcaa16e656931
 SHA512:
-  metadata.gz: 653d6cb9ee622d8547d9a6afa4defa2bfaae487ac49b648c602312b7741fb905701cdde5b2a075469d787c9c737848831a0aa6ca6f2d4ff815cc5df60f89be1f
-  data.tar.gz: 8fcaa8457b8f154a31c94184d9290603f77d8995039fb2bd5596be0d59194266c2ca488b6372829e93ee8d115dd02a01e1cff8260df255104bfa63e233d8a3c9
+  metadata.gz: 14384c56ad55ef1a681de20b03c977720fb6bbb34e677add158939666d3ebdfd1c2f9b3b09c5ef040fb944c913473645c9f323581c6f7dac2daf02e675672c5c
+  data.tar.gz: 3b076defead2957ad7a632275e5868484305dd4afd8d3d40b39b792d3d5ebd2f40b6b27d3993b3c89c09d458ac9d7c15e64d740e11e80ceb6a063f83a6cb9371

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

@@ -75,8 +75,21 @@ module Katello
       end
 
       def inherited_attributes_with_katello
-        self.content_facet.kickstart_repository_id ||= hostgroup.inherited_kickstart_repository_id if content_facet.present?
-        inherited_attributes_without_katello.concat(%w(content_source_id content_view_id lifecycle_environment_id))
+        if hostgroup.present?
+          if content_facet.present?
+            self.content_facet.kickstart_repository_id ||= hostgroup.inherited_kickstart_repository_id
+          else
+            # facent may not be present when created via autoprovisioning
+            if hostgroup.inherited_content_view_id && hostgroup.inherited_lifecycle_environment_id
+              build_content_facet(
+                :kickstart_repository_id => hostgroup.inherited_kickstart_repository_id,
+                :content_view_id => hostgroup.inherited_content_view_id,
+                :lifecycle_environment_id => hostgroup.inherited_lifecycle_environment_id
+              )
+            end
+          end
+        end
+        inherited_attributes_without_katello.concat(%w(content_source_id))
       end
 
       def import_package_profile(simple_packages)

data/app/models/katello/glue/pulp/repo.rb

@@ -239,6 +239,7 @@ module Katello
           dist.auto_publish = true
           distributors = [dist]
         when Repository::PUPPET_TYPE
+          capsule ||= SmartProxy.default_capsule
           dist_options = { :id => self.pulp_id, :auto_publish => true }
           repo_path =  File.join(capsule.puppet_path,
                                  Environment.construct_name(self.organization,

data/app/services/katello/pulp/rpm.rb

@@ -30,11 +30,16 @@ module Katello
       end
 
       def files
+        result = []
         if pulp_facts['files']
-          pulp_facts['files']['file'] + pulp_facts['files']['dir']
-        else
-          []
+          if pulp_facts['files']['file']
+            result << pulp_facts['files']['file']
+          end
+          if pulp_facts['files']['dir']
+            result << pulp_facts['files']['dir']
+          end
         end
+        result.flatten
       end
     end
   end

data/db/migrate/20161028153131_sub_facet_user_index_not_uniq.rb

@@ -0,0 +1,11 @@
+class SubFacetUserIndexNotUniq < ActiveRecord::Migration
+  def up
+    remove_index :katello_subscription_facets, [:user_id]
+    add_index :katello_subscription_facets, [:user_id], :unique => false
+  end
+
+  def down
+    remove_index :katello_subscription_facets, [:user_id]
+    add_index :katello_subscription_facets, [:user_id], :unique => true
+  end
+end

data/lib/katello/engine.rb

@@ -225,6 +225,7 @@ module Katello
       ::PuppetClassImporter.send :include, Katello::Services::PuppetClassImporterExtensions
 
       #facet extensions
+      ::Host::Managed.send :include, ::Katello::Concerns::ContentFacetHostExtensions
       Facets.register(Katello::Host::ContentFacet, :content_facet) do
         api_view :list => 'katello/api/v2/content_facet/base_with_root', :single => 'katello/api/v2/content_facet/show'
         api_docs :content_facet_attributes, ::Katello::Api::V2::HostContentsController
@@ -235,6 +236,8 @@ module Katello
         api_docs :subscription_facet_attributes, ::Katello::Api::V2::HostSubscriptionsController
       end
 
+      ::Host::Managed.send :include, ::Katello::Concerns::SubscriptionFacetHostExtensions
+
       #Api controller extensions
       ::Api::V2::HostsController.send :include, Katello::Concerns::Api::V2::HostsControllerExtensions
       ::Api::V2::HostgroupsController.send :include, Katello::Concerns::Api::V2::HostgroupsControllerExtensions

data/lib/katello/version.rb

@@ -1,3 +1,3 @@
 module Katello
-  VERSION = "3.2.0.rc3".freeze
+  VERSION = "3.2.0".freeze
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: katello
 version: !ruby/object:Gem::Version
-  version: 3.2.0.rc3
+  version: 3.2.0
 platform: ruby
 authors:
 - N/A
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-10-26 00:00:00.000000000 Z
+date: 2016-11-10 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
@@ -1345,6 +1345,7 @@ files:
 - db/migrate/20160808002834_add_files.rb
 - db/migrate/20160906181923_add_puppet_path_to_smart_proxy.rb
 - db/migrate/20161003204325_add_user_to_katello_subscription_facets.rb
+- db/migrate/20161028153131_sub_facet_user_index_not_uniq.rb
 - db/seeds.d/101-locations.rb
 - db/seeds.d/102-organizations.rb
 - db/seeds.d/103-provisioning_templates.rb
@@ -1982,12 +1983,12 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
-  - - ">"
+  - - ">="
     - !ruby/object:Gem::Version
-      version: 1.3.1
+      version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.5.0
+rubygems_version: 2.4.8
 signing_key: 
 specification_version: 4
 summary: ''