katello 3.13.1 → 3.13.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 +4 -4
- data/app/lib/actions/katello/content_view/publish.rb +3 -0
- data/app/lib/actions/katello/repository/filtered_index_content.rb +1 -0
- data/app/models/katello/concerns/host_managed_extensions.rb +4 -0
- data/app/models/katello/host/subscription_facet.rb +18 -0
- data/app/models/katello/pool.rb +1 -0
- data/app/models/katello/rhsm_fact_parser.rb +8 -6
- data/app/services/katello/pulp/repository/yum.rb +1 -1
- data/app/services/katello/registration_manager.rb +2 -0
- data/lib/katello/version.rb +1 -1
- metadata +2 -2
checksums.yaml
CHANGED
@@ -1,7 +1,7 @@
|
|
1
1
|
---
|
2
2
|
SHA256:
|
3
|
-
metadata.gz:
|
4
|
-
data.tar.gz:
|
3
|
+
metadata.gz: 8c5b6c6608f07015895a301db87b3921050b0d2e1982f24e7bb772f48ebb986b
|
4
|
+
data.tar.gz: 1bde260d489d40d422b97523c672cd543a7c1caeb3ae3ea93800ff61407b5786
|
5
5
|
SHA512:
|
6
|
-
metadata.gz:
|
7
|
-
data.tar.gz:
|
6
|
+
metadata.gz: b318b92c158a02013b8f20dca2cb9c0560e8695bdeb1df89c959754df0970ca55bee491f6dccc073d358fd7b9f242f6174472754e0a2da4d396a3593bd29a2e0
|
7
|
+
data.tar.gz: bb01b642b56e725d4bc28d5e6bca91c5cfaaaec87236133c7bb1d45b618008a9a6e11018a1bfac22fe85718b3670f86f23137600607b5d86433043f7abe23ec4
|
@@ -212,9 +212,27 @@ module Katello
|
|
212
212
|
return if host.build? || rhsm_facts.nil?
|
213
213
|
rhsm_facts[:_type] = RhsmFactName::FACT_TYPE
|
214
214
|
rhsm_facts[:_timestamp] = Time.now.to_s
|
215
|
+
if ignore_os?(host.operatingsystem, rhsm_facts)
|
216
|
+
rhsm_facts[:ignore_os] = true
|
217
|
+
end
|
215
218
|
host.import_facts(rhsm_facts)
|
216
219
|
end
|
217
220
|
|
221
|
+
def self.ignore_os?(host_os, rhsm_facts)
|
222
|
+
if host_os.nil?
|
223
|
+
return false
|
224
|
+
end
|
225
|
+
|
226
|
+
name = rhsm_facts['distribution.name']
|
227
|
+
version = rhsm_facts['distribution.version']
|
228
|
+
major, minor = version.split('.')
|
229
|
+
return host_os.name == 'CentOS' &&
|
230
|
+
!host_os.major.nil? &&
|
231
|
+
name == 'CentOS' &&
|
232
|
+
minor.blank? &&
|
233
|
+
host_os.major == major
|
234
|
+
end
|
235
|
+
|
218
236
|
def self.propose_name_from_facts(facts)
|
219
237
|
setting_fact = Setting[:register_hostname_fact]
|
220
238
|
if !setting_fact.blank? && facts[setting_fact] && facts[setting_fact] != 'localhost'
|
data/app/models/katello/pool.rb
CHANGED
@@ -22,6 +22,7 @@ module Katello
|
|
22
22
|
include Glue::Candlepin::CandlepinObject
|
23
23
|
|
24
24
|
scoped_search :on => :cp_id, :complete_value => true, :rename => :id, :only_explicit => true
|
25
|
+
scoped_search :on => :upstream_pool_id, :complete_value => true, :only_explicit => true
|
25
26
|
scoped_search :on => :quantity, :complete_value => true, :validator => ScopedSearch::Validators::INTEGER, :only_explicit => true
|
26
27
|
scoped_search :on => :start_date, :complete_value => true, :rename => :starts, :only_explicit => true
|
27
28
|
scoped_search :on => :end_date, :complete_value => true, :rename => :expires, :only_explicit => true
|
@@ -53,8 +53,14 @@ module Katello
|
|
53
53
|
|
54
54
|
os_name = ::Katello::Candlepin::Consumer.distribution_to_puppet_os(name)
|
55
55
|
major, minor = version.split('.')
|
56
|
-
|
57
|
-
os_attributes = {:major => major, :minor => minor || '', :name => os_name
|
56
|
+
unless facts['ignore_os']
|
57
|
+
os_attributes = {:major => major, :minor => minor || '', :name => os_name}
|
58
|
+
|
59
|
+
release_name = os_release_name(os_name)
|
60
|
+
if release_name
|
61
|
+
os_attributes[:release_name] = release_name
|
62
|
+
end
|
63
|
+
|
58
64
|
::Operatingsystem.find_by(os_attributes) || ::Operatingsystem.create!(os_attributes)
|
59
65
|
end
|
60
66
|
end
|
@@ -65,10 +71,6 @@ module Katello
|
|
65
71
|
end
|
66
72
|
end
|
67
73
|
|
68
|
-
def invalid_centos_os?(name, minor_version)
|
69
|
-
name == 'CentOS' && minor_version.blank?
|
70
|
-
end
|
71
|
-
|
72
74
|
#required to be defined, even if they return nil
|
73
75
|
def domain
|
74
76
|
end
|
@@ -52,7 +52,7 @@ module Katello
|
|
52
52
|
end
|
53
53
|
|
54
54
|
def distributors_to_publish(_options)
|
55
|
-
if repo.clone && !repo.master?
|
55
|
+
if repo.clone && !repo.master? && smart_proxy.pulp_master?
|
56
56
|
source_service = repo.target_repository.backend_service(smart_proxy)
|
57
57
|
source_distributor_id = source_service.lookup_distributor_id(Runcible::Models::YumDistributor.type_id)
|
58
58
|
{Runcible::Models::YumCloneDistributor => {source_repo_id: repo.target_repository.pulp_id,
|
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.13.
|
4
|
+
version: 3.13.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: 2019-
|
11
|
+
date: 2019-11-05 00:00:00.000000000 Z
|
12
12
|
dependencies:
|
13
13
|
- !ruby/object:Gem::Dependency
|
14
14
|
name: rails
|