katello 3.15.1.1 → 3.15.2
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
CHANGED
@@ -1,7 +1,7 @@
|
|
1
1
|
---
|
2
|
-
|
3
|
-
metadata.gz:
|
4
|
-
data.tar.gz:
|
2
|
+
SHA1:
|
3
|
+
metadata.gz: 4ad9b04f40e657a51875c8695653860da9fb8ae7
|
4
|
+
data.tar.gz: 812424e72605d87d742fa45d14b09a9eaebeaa30
|
5
5
|
SHA512:
|
6
|
-
metadata.gz:
|
7
|
-
data.tar.gz:
|
6
|
+
metadata.gz: 5e2c8979164f4403578cd093a6b34cb88bc091aa28179bb2c420730cc2bb10e2bf0cdf7ba2e5ac445b78cc0ba3fa46a21c4ce85c3447b88a8535b0ef5898f7c4
|
7
|
+
data.tar.gz: a8634db2c5e979b92723e368dbf92e42766d5f20d0f8757b4f88f3ac6bf56eb7c7e4f86e14510b6bb6101d517713b915aff01f6d5145ea2ac2c85ac05e0fb87c
|
@@ -38,15 +38,18 @@ module Actions
|
|
38
38
|
::Katello::ModuleStream.where(profile.slice(:name, :stream))
|
39
39
|
end
|
40
40
|
|
41
|
-
|
41
|
+
updated_profiles = []
|
42
|
+
unless query_name_streams.empty?
|
43
|
+
query_name_streams = query_name_streams.inject(&:or)
|
42
44
|
|
43
|
-
|
44
|
-
|
45
|
-
|
46
|
-
|
45
|
+
bound_library_instances = host.content_facet.bound_repositories.map(&:library_instance_or_self)
|
46
|
+
query = ::Katello::ModuleStream.in_repositories(bound_library_instances).
|
47
|
+
select(:name, :stream, :version, :context, :arch).
|
48
|
+
merge(query_name_streams)
|
47
49
|
|
48
|
-
|
49
|
-
|
50
|
+
updated_profiles = query.map do |module_stream|
|
51
|
+
module_stream.slice(:name, :stream, :version, :context, :arch)
|
52
|
+
end
|
50
53
|
end
|
51
54
|
|
52
55
|
# We also need to pass module streams that are not found in the ModuleStream table
|
@@ -55,10 +58,16 @@ module Actions
|
|
55
58
|
updated_profiles.none? { |p| p[:name] == profile[:name] && p[:stream] == profile[:stream] }
|
56
59
|
end
|
57
60
|
|
58
|
-
|
59
|
-
|
60
|
-
|
61
|
-
|
61
|
+
module_stream_profile = updated_profiles + unassociated_profiles
|
62
|
+
|
63
|
+
unless module_stream_profile.empty?
|
64
|
+
begin
|
65
|
+
::Katello::Pulp::Consumer.new(host.content_facet.uuid).
|
66
|
+
upload_module_stream_profile(module_stream_profile)
|
67
|
+
rescue RestClient::ResourceNotFound
|
68
|
+
Rails.logger.warn("Host with ID %s was not known to Pulp, continuing" % host.id)
|
69
|
+
end
|
70
|
+
end
|
62
71
|
end
|
63
72
|
|
64
73
|
def import_module_streams(payload, host)
|
@@ -124,6 +124,8 @@ module Katello
|
|
124
124
|
config.ssl_client_key = ::Cert::Certs.ssl_client_key
|
125
125
|
config.debugging = true
|
126
126
|
config.logger = ::Foreman::Logging.logger('katello/pulp_rest')
|
127
|
+
config.username = self.setting(PULP3_FEATURE, 'username')
|
128
|
+
config.password = self.setting(PULP3_FEATURE, 'password')
|
127
129
|
end
|
128
130
|
end
|
129
131
|
|
@@ -195,7 +197,7 @@ module Katello
|
|
195
197
|
pulp3_uri!.host
|
196
198
|
end
|
197
199
|
|
198
|
-
def pulp3_url(path = '/pulp/api/v3
|
200
|
+
def pulp3_url(path = '/pulp/api/v3')
|
199
201
|
pulp_url = self.setting(PULP3_FEATURE, 'pulp_url')
|
200
202
|
path.blank? ? pulp_url : "#{pulp_url.sub(%r|/$|, '')}/#{path.sub(%r|^/|, '')}"
|
201
203
|
end
|
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.15.
|
4
|
+
version: 3.15.2
|
5
5
|
platform: ruby
|
6
6
|
authors:
|
7
7
|
- N/A
|
8
8
|
autorequire:
|
9
9
|
bindir: bin
|
10
10
|
cert_chain: []
|
11
|
-
date: 2020-
|
11
|
+
date: 2020-06-17 00:00:00.000000000 Z
|
12
12
|
dependencies:
|
13
13
|
- !ruby/object:Gem::Dependency
|
14
14
|
name: rails
|
@@ -84,16 +84,16 @@ dependencies:
|
|
84
84
|
name: foreman-tasks
|
85
85
|
requirement: !ruby/object:Gem::Requirement
|
86
86
|
requirements:
|
87
|
-
- - "
|
87
|
+
- - "<"
|
88
88
|
- !ruby/object:Gem::Version
|
89
|
-
version:
|
89
|
+
version: 1.2.0
|
90
90
|
type: :runtime
|
91
91
|
prerelease: false
|
92
92
|
version_requirements: !ruby/object:Gem::Requirement
|
93
93
|
requirements:
|
94
|
-
- - "
|
94
|
+
- - "<"
|
95
95
|
- !ruby/object:Gem::Version
|
96
|
-
version:
|
96
|
+
version: 1.2.0
|
97
97
|
- !ruby/object:Gem::Dependency
|
98
98
|
name: dynflow
|
99
99
|
requirement: !ruby/object:Gem::Requirement
|
@@ -4652,7 +4652,8 @@ required_rubygems_version: !ruby/object:Gem::Requirement
|
|
4652
4652
|
- !ruby/object:Gem::Version
|
4653
4653
|
version: '0'
|
4654
4654
|
requirements: []
|
4655
|
-
|
4655
|
+
rubyforge_project:
|
4656
|
+
rubygems_version: 2.5.2.1
|
4656
4657
|
signing_key:
|
4657
4658
|
specification_version: 4
|
4658
4659
|
summary: Content and Subscription Management plugin for Foreman
|