katello 3.2.0.rc3 → 3.2.0
Sign up to get free protection for your applications and to get access to all the features.
Potentially problematic release.
This version of katello might be problematic. Click here for more details.
- checksums.yaml +4 -4
- data/app/models/katello/concerns/host_managed_extensions.rb +15 -2
- data/app/models/katello/glue/pulp/repo.rb +1 -0
- data/app/services/katello/pulp/rpm.rb +8 -3
- data/db/migrate/20161028153131_sub_facet_user_index_not_uniq.rb +11 -0
- data/lib/katello/engine.rb +3 -0
- data/lib/katello/version.rb +1 -1
- metadata +6 -5
checksums.yaml
CHANGED
@@ -1,7 +1,7 @@
|
|
1
1
|
---
|
2
2
|
SHA1:
|
3
|
-
metadata.gz:
|
4
|
-
data.tar.gz:
|
3
|
+
metadata.gz: 983bb2638d8d7bda5fc1c721754d3783b51b2213
|
4
|
+
data.tar.gz: c9c271f48b0a3adc7d40d73a252dcaa16e656931
|
5
5
|
SHA512:
|
6
|
-
metadata.gz:
|
7
|
-
data.tar.gz:
|
6
|
+
metadata.gz: 14384c56ad55ef1a681de20b03c977720fb6bbb34e677add158939666d3ebdfd1c2f9b3b09c5ef040fb944c913473645c9f323581c6f7dac2daf02e675672c5c
|
7
|
+
data.tar.gz: 3b076defead2957ad7a632275e5868484305dd4afd8d3d40b39b792d3d5ebd2f40b6b27d3993b3c89c09d458ac9d7c15e64d740e11e80ceb6a063f83a6cb9371
|
@@ -75,8 +75,21 @@ module Katello
|
|
75
75
|
end
|
76
76
|
|
77
77
|
def inherited_attributes_with_katello
|
78
|
-
|
79
|
-
|
78
|
+
if hostgroup.present?
|
79
|
+
if content_facet.present?
|
80
|
+
self.content_facet.kickstart_repository_id ||= hostgroup.inherited_kickstart_repository_id
|
81
|
+
else
|
82
|
+
# facent may not be present when created via autoprovisioning
|
83
|
+
if hostgroup.inherited_content_view_id && hostgroup.inherited_lifecycle_environment_id
|
84
|
+
build_content_facet(
|
85
|
+
:kickstart_repository_id => hostgroup.inherited_kickstart_repository_id,
|
86
|
+
:content_view_id => hostgroup.inherited_content_view_id,
|
87
|
+
:lifecycle_environment_id => hostgroup.inherited_lifecycle_environment_id
|
88
|
+
)
|
89
|
+
end
|
90
|
+
end
|
91
|
+
end
|
92
|
+
inherited_attributes_without_katello.concat(%w(content_source_id))
|
80
93
|
end
|
81
94
|
|
82
95
|
def import_package_profile(simple_packages)
|
@@ -239,6 +239,7 @@ module Katello
|
|
239
239
|
dist.auto_publish = true
|
240
240
|
distributors = [dist]
|
241
241
|
when Repository::PUPPET_TYPE
|
242
|
+
capsule ||= SmartProxy.default_capsule
|
242
243
|
dist_options = { :id => self.pulp_id, :auto_publish => true }
|
243
244
|
repo_path = File.join(capsule.puppet_path,
|
244
245
|
Environment.construct_name(self.organization,
|
@@ -30,11 +30,16 @@ module Katello
|
|
30
30
|
end
|
31
31
|
|
32
32
|
def files
|
33
|
+
result = []
|
33
34
|
if pulp_facts['files']
|
34
|
-
pulp_facts['files']['file']
|
35
|
-
|
36
|
-
|
35
|
+
if pulp_facts['files']['file']
|
36
|
+
result << pulp_facts['files']['file']
|
37
|
+
end
|
38
|
+
if pulp_facts['files']['dir']
|
39
|
+
result << pulp_facts['files']['dir']
|
40
|
+
end
|
37
41
|
end
|
42
|
+
result.flatten
|
38
43
|
end
|
39
44
|
end
|
40
45
|
end
|
@@ -0,0 +1,11 @@
|
|
1
|
+
class SubFacetUserIndexNotUniq < ActiveRecord::Migration
|
2
|
+
def up
|
3
|
+
remove_index :katello_subscription_facets, [:user_id]
|
4
|
+
add_index :katello_subscription_facets, [:user_id], :unique => false
|
5
|
+
end
|
6
|
+
|
7
|
+
def down
|
8
|
+
remove_index :katello_subscription_facets, [:user_id]
|
9
|
+
add_index :katello_subscription_facets, [:user_id], :unique => true
|
10
|
+
end
|
11
|
+
end
|
data/lib/katello/engine.rb
CHANGED
@@ -225,6 +225,7 @@ module Katello
|
|
225
225
|
::PuppetClassImporter.send :include, Katello::Services::PuppetClassImporterExtensions
|
226
226
|
|
227
227
|
#facet extensions
|
228
|
+
::Host::Managed.send :include, ::Katello::Concerns::ContentFacetHostExtensions
|
228
229
|
Facets.register(Katello::Host::ContentFacet, :content_facet) do
|
229
230
|
api_view :list => 'katello/api/v2/content_facet/base_with_root', :single => 'katello/api/v2/content_facet/show'
|
230
231
|
api_docs :content_facet_attributes, ::Katello::Api::V2::HostContentsController
|
@@ -235,6 +236,8 @@ module Katello
|
|
235
236
|
api_docs :subscription_facet_attributes, ::Katello::Api::V2::HostSubscriptionsController
|
236
237
|
end
|
237
238
|
|
239
|
+
::Host::Managed.send :include, ::Katello::Concerns::SubscriptionFacetHostExtensions
|
240
|
+
|
238
241
|
#Api controller extensions
|
239
242
|
::Api::V2::HostsController.send :include, Katello::Concerns::Api::V2::HostsControllerExtensions
|
240
243
|
::Api::V2::HostgroupsController.send :include, Katello::Concerns::Api::V2::HostgroupsControllerExtensions
|
data/lib/katello/version.rb
CHANGED
metadata
CHANGED
@@ -1,14 +1,14 @@
|
|
1
1
|
--- !ruby/object:Gem::Specification
|
2
2
|
name: katello
|
3
3
|
version: !ruby/object:Gem::Version
|
4
|
-
version: 3.2.0
|
4
|
+
version: 3.2.0
|
5
5
|
platform: ruby
|
6
6
|
authors:
|
7
7
|
- N/A
|
8
8
|
autorequire:
|
9
9
|
bindir: bin
|
10
10
|
cert_chain: []
|
11
|
-
date: 2016-10
|
11
|
+
date: 2016-11-10 00:00:00.000000000 Z
|
12
12
|
dependencies:
|
13
13
|
- !ruby/object:Gem::Dependency
|
14
14
|
name: rails
|
@@ -1345,6 +1345,7 @@ files:
|
|
1345
1345
|
- db/migrate/20160808002834_add_files.rb
|
1346
1346
|
- db/migrate/20160906181923_add_puppet_path_to_smart_proxy.rb
|
1347
1347
|
- db/migrate/20161003204325_add_user_to_katello_subscription_facets.rb
|
1348
|
+
- db/migrate/20161028153131_sub_facet_user_index_not_uniq.rb
|
1348
1349
|
- db/seeds.d/101-locations.rb
|
1349
1350
|
- db/seeds.d/102-organizations.rb
|
1350
1351
|
- db/seeds.d/103-provisioning_templates.rb
|
@@ -1982,12 +1983,12 @@ required_ruby_version: !ruby/object:Gem::Requirement
|
|
1982
1983
|
version: '0'
|
1983
1984
|
required_rubygems_version: !ruby/object:Gem::Requirement
|
1984
1985
|
requirements:
|
1985
|
-
- - "
|
1986
|
+
- - ">="
|
1986
1987
|
- !ruby/object:Gem::Version
|
1987
|
-
version:
|
1988
|
+
version: '0'
|
1988
1989
|
requirements: []
|
1989
1990
|
rubyforge_project:
|
1990
|
-
rubygems_version: 2.
|
1991
|
+
rubygems_version: 2.4.8
|
1991
1992
|
signing_key:
|
1992
1993
|
specification_version: 4
|
1993
1994
|
summary: ''
|