katello 3.5.1 → 3.5.1.1
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- checksums.yaml +4 -4
- data/app/lib/actions/candlepin/owner/import_products.rb +3 -1
- data/app/lib/actions/katello/host/hypervisors_update.rb +3 -1
- data/app/lib/actions/katello/organization/create.rb +2 -2
- data/app/lib/actions/katello/organization/manifest_refresh.rb +2 -1
- data/app/models/katello/glue/candlepin/pool.rb +5 -1
- data/lib/katello/version.rb +1 -1
- metadata +3 -3
checksums.yaml
CHANGED
|
@@ -1,7 +1,7 @@
|
|
|
1
1
|
---
|
|
2
2
|
SHA1:
|
|
3
|
-
metadata.gz:
|
|
4
|
-
data.tar.gz:
|
|
3
|
+
metadata.gz: 58fe4c573c3d98f121ceaf5e70a9f66d997e1d23
|
|
4
|
+
data.tar.gz: 7158cda305566eeca84c46d165c6f851e98d7bfc
|
|
5
5
|
SHA512:
|
|
6
|
-
metadata.gz:
|
|
7
|
-
data.tar.gz:
|
|
6
|
+
metadata.gz: 55958b5b84e983b6e208cdf75bddebd7e0d54c3528f0d55642ef0356ffaedb3345e4d4a3b338c6d992410d92025686d967f3f7b89196978fccc31c93bec9230e
|
|
7
|
+
data.tar.gz: b493dc0e535f9077115062340bad57acf19bb46a6dc9e2477aba5f9c21d94ad378ba1e00650330ba28c27f7cb6adbb0b0c6385dd114544d57713312209c27ea1
|
|
@@ -16,7 +16,9 @@ module Actions
|
|
|
16
16
|
hypervisors = input[:hypervisors]
|
|
17
17
|
|
|
18
18
|
if hypervisors
|
|
19
|
-
|
|
19
|
+
User.as_anonymous_admin do
|
|
20
|
+
hypervisors.each { |hypervisor| update_or_create_hypervisor(hypervisor) }
|
|
21
|
+
end
|
|
20
22
|
end
|
|
21
23
|
end
|
|
22
24
|
|
|
@@ -5,8 +5,8 @@ module Actions
|
|
|
5
5
|
def plan(organization)
|
|
6
6
|
organization.setup_label_from_name
|
|
7
7
|
organization.create_library
|
|
8
|
-
organization.create_anonymous_provider
|
|
9
|
-
organization.create_redhat_provider
|
|
8
|
+
organization.create_anonymous_provider unless organization.anonymous_provider
|
|
9
|
+
organization.create_redhat_provider unless organization.redhat_provider
|
|
10
10
|
cp_create = nil
|
|
11
11
|
|
|
12
12
|
organization.save!
|
|
@@ -31,7 +31,8 @@ module Actions
|
|
|
31
31
|
import_products = plan_action(Candlepin::Owner::ImportProducts, :organization_id => organization.id, :dependency => owner_import.output)
|
|
32
32
|
|
|
33
33
|
if manifest_update && SETTINGS[:katello][:use_pulp]
|
|
34
|
-
|
|
34
|
+
repositories = ::Katello::Repository.in_default_view.where(:product_id => ::Katello::Product.redhat.in_org(organization))
|
|
35
|
+
repositories.each do |repo|
|
|
35
36
|
plan_action(Katello::Repository::RefreshRepository, repo, :dependency => import_products.output)
|
|
36
37
|
end
|
|
37
38
|
end
|
|
@@ -129,7 +129,11 @@ module Katello
|
|
|
129
129
|
pool_attributes[:unmapped_guest] = true
|
|
130
130
|
end
|
|
131
131
|
|
|
132
|
-
|
|
132
|
+
if subscription.try(:redhat?)
|
|
133
|
+
pool_attributes[:virt_who] = pool_attributes['virt_limit'] != "0" && pool_attributes['virt_limit'].present?
|
|
134
|
+
else
|
|
135
|
+
pool_attributes[:virt_who] = false
|
|
136
|
+
end
|
|
133
137
|
|
|
134
138
|
exceptions = pool_attributes.keys.map(&:to_sym) - self.attribute_names.map(&:to_sym)
|
|
135
139
|
self.update_attributes(pool_attributes.except!(*exceptions))
|
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.5.1
|
|
4
|
+
version: 3.5.1.1
|
|
5
5
|
platform: ruby
|
|
6
6
|
authors:
|
|
7
7
|
- N/A
|
|
8
8
|
autorequire:
|
|
9
9
|
bindir: bin
|
|
10
10
|
cert_chain: []
|
|
11
|
-
date: 2018-02-
|
|
11
|
+
date: 2018-02-06 00:00:00.000000000 Z
|
|
12
12
|
dependencies:
|
|
13
13
|
- !ruby/object:Gem::Dependency
|
|
14
14
|
name: rails
|
|
@@ -2100,7 +2100,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
|
|
|
2100
2100
|
version: '0'
|
|
2101
2101
|
requirements: []
|
|
2102
2102
|
rubyforge_project:
|
|
2103
|
-
rubygems_version: 2.
|
|
2103
|
+
rubygems_version: 2.4.6
|
|
2104
2104
|
signing_key:
|
|
2105
2105
|
specification_version: 4
|
|
2106
2106
|
summary: ''
|