katello 3.4.0 → 3.4.0.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/katello/foreman.rb +15 -13
- data/engines/bastion_katello/app/assets/javascripts/bastion_katello/host-collections/details/host-collection-add-hosts.controller.js +1 -0
- data/engines/bastion_katello/app/assets/javascripts/bastion_katello/host-collections/details/host-collection-hosts.controller.js +1 -0
- data/lib/katello/version.rb +1 -1
- metadata +2 -2
checksums.yaml
CHANGED
|
@@ -1,7 +1,7 @@
|
|
|
1
1
|
---
|
|
2
2
|
SHA1:
|
|
3
|
-
metadata.gz:
|
|
4
|
-
data.tar.gz:
|
|
3
|
+
metadata.gz: 9fb6dbdc97d88c92f899d5d4c1bec535653ba49f
|
|
4
|
+
data.tar.gz: 7ec4b3d715dda3332ce222437159e879391e4bb4
|
|
5
5
|
SHA512:
|
|
6
|
-
metadata.gz:
|
|
7
|
-
data.tar.gz:
|
|
6
|
+
metadata.gz: 36140d929b90eb6783106bf712b5a87f1055b8cc898dc4902737d3b4b012df2333eaa8074f848a720b19dad92b20823877f3e88f0ea5eeb77f4bf8cd4764af76
|
|
7
|
+
data.tar.gz: 9325f2f0fac81575ec37f617939e2b09ff10d344fac61a13ac631851c552385030c8529924059c97a456260b6b44b0151693fa50742fd51b027457eb077cd1d1
|
data/app/lib/katello/foreman.rb
CHANGED
|
@@ -7,21 +7,23 @@ module Katello
|
|
|
7
7
|
end
|
|
8
8
|
|
|
9
9
|
def self.update_puppet_environment(content_view, environment)
|
|
10
|
-
|
|
11
|
-
|
|
12
|
-
|
|
10
|
+
User.as_anonymous_admin do
|
|
11
|
+
content_view_puppet_env = content_view.version(environment).puppet_env(environment)
|
|
12
|
+
if !content_view.default? && content_view_puppet_env
|
|
13
|
+
foreman_environment = content_view_puppet_env.puppet_environment
|
|
13
14
|
|
|
14
|
-
|
|
15
|
-
|
|
16
|
-
|
|
17
|
-
|
|
18
|
-
|
|
19
|
-
|
|
20
|
-
|
|
21
|
-
|
|
15
|
+
# Associate the puppet environment with the locations that are currently
|
|
16
|
+
# associated with the capsules that have the target lifecycle environment.
|
|
17
|
+
capsule_contents = Katello::CapsuleContent.with_environment(environment, true)
|
|
18
|
+
unless capsule_contents.blank?
|
|
19
|
+
locations = capsule_contents.map(&:capsule).map(&:locations).compact.flatten.uniq
|
|
20
|
+
foreman_environment.locations = locations
|
|
21
|
+
foreman_environment.save!
|
|
22
|
+
end
|
|
22
23
|
|
|
23
|
-
|
|
24
|
-
|
|
24
|
+
if (foreman_smart_proxy = SmartProxy.default_capsule)
|
|
25
|
+
PuppetClassImporter.new(:url => foreman_smart_proxy.url, :env => foreman_environment.name).update_environment
|
|
26
|
+
end
|
|
25
27
|
end
|
|
26
28
|
end
|
|
27
29
|
end
|
|
@@ -38,6 +38,7 @@ angular.module('Bastion.host-collections').controller('HostCollectionAddHostsCon
|
|
|
38
38
|
return term + " and " + addition;
|
|
39
39
|
};
|
|
40
40
|
|
|
41
|
+
contentNutupane.refresh();
|
|
41
42
|
$scope.table = contentNutupane.table;
|
|
42
43
|
$scope.isAdding = false;
|
|
43
44
|
$scope.table.closeItem = function () {};
|
|
@@ -42,6 +42,7 @@ angular.module('Bastion.host-collections').controller('HostCollectionHostsContro
|
|
|
42
42
|
$scope.table.closeItem = function () {};
|
|
43
43
|
$scope.isRemoving = false;
|
|
44
44
|
$scope.contentNutupane.setSearchKey('contentHostSearch');
|
|
45
|
+
$scope.contentNutupane.refresh();
|
|
45
46
|
|
|
46
47
|
$scope.removeSelected = function () {
|
|
47
48
|
var selected = _.map($scope.table.getSelected(), '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.4.0
|
|
4
|
+
version: 3.4.0.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: 2017-05-
|
|
11
|
+
date: 2017-05-17 00:00:00.000000000 Z
|
|
12
12
|
dependencies:
|
|
13
13
|
- !ruby/object:Gem::Dependency
|
|
14
14
|
name: rails
|