katello 3.17.0.rc2.1 → 3.17.3
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/controllers/katello/api/v2/api_controller.rb +1 -2
- data/app/controllers/katello/api/v2/content_view_versions_controller.rb +9 -1
- data/app/controllers/katello/api/v2/host_tracer_controller.rb +16 -36
- data/app/controllers/katello/api/v2/hosts_bulk_actions_controller.rb +12 -1
- data/app/controllers/katello/concerns/organizations_controller_extensions.rb +23 -0
- data/app/lib/actions/katello/applicability/hosts/bulk_generate.rb +6 -2
- data/app/lib/actions/katello/capsule_content/sync_capsule.rb +6 -2
- data/app/lib/actions/katello/content_view/promote.rb +2 -2
- data/app/lib/actions/katello/content_view/promote_to_environment.rb +12 -3
- data/app/lib/actions/katello/content_view/publish.rb +18 -2
- data/app/lib/actions/katello/content_view_version/import.rb +36 -0
- data/app/lib/actions/katello/content_view_version/incremental_update.rb +1 -1
- data/app/lib/actions/katello/host/hypervisors_update.rb +18 -0
- data/app/lib/actions/katello/organization/create.rb +1 -1
- data/app/lib/actions/katello/organization/simple_content_access/disable.rb +8 -0
- data/app/lib/actions/katello/organization/simple_content_access/enable.rb +8 -0
- data/app/lib/actions/katello/organization/simple_content_access/toggle.rb +16 -2
- data/app/lib/actions/katello/repository/multi_clone_contents.rb +8 -6
- data/app/lib/actions/pulp3/abstract_async_task.rb +1 -0
- data/app/lib/actions/pulp3/content_view/delete_repository_references.rb +1 -1
- data/app/lib/actions/pulp3/content_view_version/create_importer.rb +20 -0
- data/app/lib/actions/pulp3/content_view_version/destroy_importer.rb +16 -0
- data/app/lib/actions/pulp3/content_view_version/import.rb +21 -0
- data/app/lib/actions/pulp3/orchestration/content_view_version/copy_version_units_to_library.rb +25 -0
- data/app/lib/actions/pulp3/orchestration/content_view_version/export.rb +9 -1
- data/app/lib/actions/pulp3/orchestration/content_view_version/import.rb +41 -0
- data/app/lib/actions/pulp3/repository/copy_content.rb +6 -1
- data/app/lib/actions/pulp3/repository/delete.rb +1 -1
- data/app/lib/actions/pulp3/repository/multi_copy_content.rb +1 -1
- data/app/lib/katello/resources/cdn.rb +3 -2
- data/app/lib/katello/util/cdn_var_substitutor.rb +9 -7
- data/app/models/katello/concerns/redhat_extensions.rb +2 -2
- data/app/models/katello/concerns/smart_proxy_extensions.rb +3 -1
- data/app/models/katello/content_view.rb +6 -0
- data/app/models/katello/content_view_version.rb +10 -1
- data/app/models/katello/glue/pulp/repo.rb +1 -1
- data/app/models/katello/root_repository.rb +5 -1
- data/app/overrides/add_organization_attributes.rb +12 -0
- data/app/services/katello/applicability/applicable_content_helper.rb +12 -1
- data/app/services/katello/host_trace_manager.rb +38 -0
- data/app/services/katello/pulp3/content_view_version/export.rb +25 -29
- data/app/services/katello/pulp3/content_view_version/import.rb +87 -0
- data/app/services/katello/pulp3/content_view_version/import_export_common.rb +44 -0
- data/app/services/katello/pulp3/erratum.rb +2 -1
- data/app/services/katello/pulp3/repository.rb +8 -4
- data/app/services/katello/pulp3/repository/yum.rb +71 -4
- data/app/services/katello/pulp3/task.rb +4 -4
- data/app/services/katello/pulp3/task_group.rb +6 -0
- data/app/services/katello/ui_notifications/subscriptions/sca_disable_error.rb +13 -0
- data/app/services/katello/ui_notifications/subscriptions/sca_disable_success.rb +13 -0
- data/app/services/katello/ui_notifications/subscriptions/sca_enable_error.rb +13 -0
- data/app/services/katello/ui_notifications/subscriptions/sca_enable_success.rb +13 -0
- data/app/views/overrides/organizations/_edit_override.html.erb +10 -1
- data/app/views/overrides/organizations/_index_header_override.html.erb +3 -0
- data/app/views/overrides/organizations/_index_row_override.html.erb +3 -0
- data/config/routes/api/v2.rb +1 -6
- data/config/routes/overrides.rb +4 -0
- data/db/migrate/20150930183738_migrate_content_hosts.rb +1 -1
- data/db/migrate/20200514092553_move_katello_fields_from_hostgroups.katello.rb +5 -2
- data/db/seeds.d/109-katello-notification-blueprints.rb +24 -0
- data/engines/bastion_katello/app/assets/javascripts/bastion_katello/activation-keys/details/activation-key-associations.controller.js +2 -5
- data/engines/bastion_katello/app/assets/javascripts/bastion_katello/activation-keys/details/activation-key-repository-sets.controller.js +4 -3
- data/engines/bastion_katello/app/assets/javascripts/bastion_katello/activation-keys/details/activation-key-subscriptions.controller.js +2 -4
- data/engines/bastion_katello/app/assets/javascripts/bastion_katello/activation-keys/details/views/activation-key-repository-sets.html +1 -1
- data/engines/bastion_katello/app/assets/javascripts/bastion_katello/common/views/katello-agent-notice.html +1 -1
- data/engines/bastion_katello/app/assets/javascripts/bastion_katello/content-hosts/bulk/content-hosts-bulk-traces-modal.controller.js +3 -4
- data/engines/bastion_katello/app/assets/javascripts/bastion_katello/content-hosts/details/content-host-details-info.controller.js +2 -4
- data/engines/bastion_katello/app/assets/javascripts/bastion_katello/content-hosts/details/content-host-repository-sets.controller.js +4 -3
- data/engines/bastion_katello/app/assets/javascripts/bastion_katello/content-hosts/details/content-host-subscriptions.controller.js +2 -4
- data/engines/bastion_katello/app/assets/javascripts/bastion_katello/content-hosts/details/views/content-host-repository-sets.html +1 -1
- data/engines/bastion_katello/app/assets/javascripts/bastion_katello/content-hosts/views/register-client.html +1 -1
- data/engines/bastion_katello/app/assets/javascripts/bastion_katello/hosts/host-bulk-action.factory.js +2 -1
- data/engines/bastion_katello/app/assets/javascripts/bastion_katello/i18n/bastion_katello.pot +1 -1
- data/engines/bastion_katello/app/assets/javascripts/bastion_katello/products/details/repositories/details/views/repository-info.html +1 -1
- data/engines/bastion_katello/app/assets/javascripts/bastion_katello/products/details/repositories/new/views/new-repository.html +2 -2
- data/lib/katello/permission_creator.rb +1 -1
- data/lib/katello/permissions/host_permissions.rb +1 -0
- data/lib/katello/tasks/pulp3_content_switchover.rake +3 -1
- data/lib/katello/tasks/pulp3_post_migration_check.rake +2 -1
- data/lib/katello/tasks/reimport.rake +1 -1
- data/lib/katello/tasks/reports.rake +4 -1
- data/lib/katello/version.rb +1 -1
- data/webpack/index.js +0 -1
- metadata +34 -14
- data/engines/bastion_katello/app/assets/javascripts/bastion_katello/hosts/host-traces-resolve.factory.js +0 -18
@@ -134,7 +134,7 @@ module Katello
|
|
134
134
|
@plugin.permission :publish_content_views,
|
135
135
|
{
|
136
136
|
'katello/api/v2/content_views' => [:publish],
|
137
|
-
'katello/api/v2/content_view_versions' => [:incremental_update, :republish_repositories]
|
137
|
+
'katello/api/v2/content_view_versions' => [:incremental_update, :republish_repositories, :import]
|
138
138
|
},
|
139
139
|
:resource_type => 'Katello::ContentView'
|
140
140
|
@plugin.permission :promote_or_remove_content_views,
|
@@ -27,6 +27,7 @@ Foreman::AccessControl.permission(:edit_hosts).actions.concat [
|
|
27
27
|
'katello/api/v2/hosts_bulk_actions/environment_content_view',
|
28
28
|
'katello/api/v2/hosts_bulk_actions/release_version',
|
29
29
|
'katello/api/v2/hosts_bulk_actions/traces',
|
30
|
+
'katello/api/v2/hosts_bulk_actions/resolve_traces',
|
30
31
|
'katello/api/rhsm/candlepin_dynflow_proxy/upload_package_profile',
|
31
32
|
'katello/api/rhsm/candlepin_dynflow_proxy/upload_profiles',
|
32
33
|
'katello/api/rhsm/candlepin_dynflow_proxy/deb_package_profile',
|
@@ -1,9 +1,11 @@
|
|
1
|
+
load "#{Katello::Engine.root}/lib/katello/tasks/common.rake"
|
2
|
+
|
1
3
|
require File.expand_path("../engine", File.dirname(__FILE__))
|
2
4
|
require "#{Katello::Engine.root}/app/services/katello/pulp3/migration_switchover"
|
3
5
|
|
4
6
|
namespace :katello do
|
5
7
|
desc "Runs a Pulp 3 migration of pulp3 hrefs to pulp ids for supported content types."
|
6
|
-
task :pulp3_content_switchover => :environment do
|
8
|
+
task :pulp3_content_switchover => [:environment, :disable_dynflow] do
|
7
9
|
begin
|
8
10
|
User.current = User.anonymous_admin
|
9
11
|
|
@@ -1,8 +1,9 @@
|
|
1
1
|
require File.expand_path("../engine", File.dirname(__FILE__))
|
2
|
+
load "#{Katello::Engine.root}/lib/katello/tasks/common.rake"
|
2
3
|
|
3
4
|
namespace :katello do
|
4
5
|
desc "Runs a post Pulp3 migration check for supported content types."
|
5
|
-
task :pulp3_post_migration_check => :environment do
|
6
|
+
task :pulp3_post_migration_check => [:environment, :disable_dynflow] do
|
6
7
|
User.current = User.anonymous_admin
|
7
8
|
repository_types = Katello::Pulp3::Migration.repository_types_for_migration
|
8
9
|
|
@@ -12,7 +12,7 @@ namespace :katello do
|
|
12
12
|
end
|
13
13
|
|
14
14
|
desc "Reimports information from backend systems"
|
15
|
-
task :reimport => ["
|
15
|
+
task :reimport => ["dynflow:client", "katello:check_ping"] do
|
16
16
|
User.current = User.anonymous_admin #set a user for orchestration
|
17
17
|
Dir.glob(Katello::Engine.root.to_s + '/app/models/katello/*.rb').each { |file| require file }
|
18
18
|
|
@@ -1,4 +1,7 @@
|
|
1
1
|
load "#{Rails.root}/lib/tasks/reports.rake"
|
2
2
|
|
3
3
|
#Katello reports can generate a foreman task, so mark the task as a dynflow client
|
4
|
-
["reports:daily", "reports:weekly", "reports:monthly"].each
|
4
|
+
["reports:daily", "reports:weekly", "reports:monthly"].each do |task|
|
5
|
+
Rake::Task[task].clear
|
6
|
+
Rake::Task[task].enhance ["dynflow:client"]
|
7
|
+
end
|
data/lib/katello/version.rb
CHANGED
data/webpack/index.js
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.17.
|
4
|
+
version: 3.17.3
|
5
5
|
platform: ruby
|
6
6
|
authors:
|
7
7
|
- N/A
|
8
8
|
autorequire:
|
9
9
|
bindir: bin
|
10
10
|
cert_chain: []
|
11
|
-
date:
|
11
|
+
date: 2021-03-02 00:00:00.000000000 Z
|
12
12
|
dependencies:
|
13
13
|
- !ruby/object:Gem::Dependency
|
14
14
|
name: rails
|
@@ -87,6 +87,9 @@ dependencies:
|
|
87
87
|
- - ">="
|
88
88
|
- !ruby/object:Gem::Version
|
89
89
|
version: 0.14.1
|
90
|
+
- - "<"
|
91
|
+
- !ruby/object:Gem::Version
|
92
|
+
version: 4.0.0
|
90
93
|
type: :runtime
|
91
94
|
prerelease: false
|
92
95
|
version_requirements: !ruby/object:Gem::Requirement
|
@@ -94,6 +97,9 @@ dependencies:
|
|
94
97
|
- - ">="
|
95
98
|
- !ruby/object:Gem::Version
|
96
99
|
version: 0.14.1
|
100
|
+
- - "<"
|
101
|
+
- !ruby/object:Gem::Version
|
102
|
+
version: 4.0.0
|
97
103
|
- !ruby/object:Gem::Dependency
|
98
104
|
name: foreman_remote_execution
|
99
105
|
requirement: !ruby/object:Gem::Requirement
|
@@ -340,40 +346,40 @@ dependencies:
|
|
340
346
|
requirements:
|
341
347
|
- - ">="
|
342
348
|
- !ruby/object:Gem::Version
|
343
|
-
version: 3.
|
349
|
+
version: 3.9.0
|
344
350
|
- - "<"
|
345
351
|
- !ruby/object:Gem::Version
|
346
|
-
version: 3.
|
352
|
+
version: 3.10.0
|
347
353
|
type: :runtime
|
348
354
|
prerelease: false
|
349
355
|
version_requirements: !ruby/object:Gem::Requirement
|
350
356
|
requirements:
|
351
357
|
- - ">="
|
352
358
|
- !ruby/object:Gem::Version
|
353
|
-
version: 3.
|
359
|
+
version: 3.9.0
|
354
360
|
- - "<"
|
355
361
|
- !ruby/object:Gem::Version
|
356
|
-
version: 3.
|
362
|
+
version: 3.10.0
|
357
363
|
- !ruby/object:Gem::Dependency
|
358
364
|
name: pulp_2to3_migration_client
|
359
365
|
requirement: !ruby/object:Gem::Requirement
|
360
366
|
requirements:
|
361
367
|
- - ">="
|
362
368
|
- !ruby/object:Gem::Version
|
363
|
-
version: 0.
|
369
|
+
version: 0.7.0
|
364
370
|
- - "<"
|
365
371
|
- !ruby/object:Gem::Version
|
366
|
-
version: 0.
|
372
|
+
version: 0.8.0
|
367
373
|
type: :runtime
|
368
374
|
prerelease: false
|
369
375
|
version_requirements: !ruby/object:Gem::Requirement
|
370
376
|
requirements:
|
371
377
|
- - ">="
|
372
378
|
- !ruby/object:Gem::Version
|
373
|
-
version: 0.
|
379
|
+
version: 0.7.0
|
374
380
|
- - "<"
|
375
381
|
- !ruby/object:Gem::Version
|
376
|
-
version: 0.
|
382
|
+
version: 0.8.0
|
377
383
|
- !ruby/object:Gem::Dependency
|
378
384
|
name: pulp_certguard_client
|
379
385
|
requirement: !ruby/object:Gem::Requirement
|
@@ -854,6 +860,7 @@ files:
|
|
854
860
|
- app/lib/actions/katello/content_view_version/create_repos.rb
|
855
861
|
- app/lib/actions/katello/content_view_version/destroy.rb
|
856
862
|
- app/lib/actions/katello/content_view_version/export.rb
|
863
|
+
- app/lib/actions/katello/content_view_version/import.rb
|
857
864
|
- app/lib/actions/katello/content_view_version/incremental_update.rb
|
858
865
|
- app/lib/actions/katello/content_view_version/republish_repositories.rb
|
859
866
|
- app/lib/actions/katello/environment/destroy.rb
|
@@ -1037,10 +1044,15 @@ files:
|
|
1037
1044
|
- app/lib/actions/pulp3/content_migration.rb
|
1038
1045
|
- app/lib/actions/pulp3/content_view/delete_repository_references.rb
|
1039
1046
|
- app/lib/actions/pulp3/content_view_version/create_exporter.rb
|
1047
|
+
- app/lib/actions/pulp3/content_view_version/create_importer.rb
|
1040
1048
|
- app/lib/actions/pulp3/content_view_version/destroy_exporter.rb
|
1049
|
+
- app/lib/actions/pulp3/content_view_version/destroy_importer.rb
|
1041
1050
|
- app/lib/actions/pulp3/content_view_version/export.rb
|
1051
|
+
- app/lib/actions/pulp3/content_view_version/import.rb
|
1042
1052
|
- app/lib/actions/pulp3/import_migration.rb
|
1053
|
+
- app/lib/actions/pulp3/orchestration/content_view_version/copy_version_units_to_library.rb
|
1043
1054
|
- app/lib/actions/pulp3/orchestration/content_view_version/export.rb
|
1055
|
+
- app/lib/actions/pulp3/orchestration/content_view_version/import.rb
|
1044
1056
|
- app/lib/actions/pulp3/orchestration/orphan_cleanup/remove_orphans.rb
|
1045
1057
|
- app/lib/actions/pulp3/orchestration/repository/copy_all_units.rb
|
1046
1058
|
- app/lib/actions/pulp3/orchestration/repository/create.rb
|
@@ -1400,6 +1412,7 @@ files:
|
|
1400
1412
|
- app/services/katello/event_monitor/poller_thread.rb
|
1401
1413
|
- app/services/katello/event_queue.rb
|
1402
1414
|
- app/services/katello/host_status_manager.rb
|
1415
|
+
- app/services/katello/host_trace_manager.rb
|
1403
1416
|
- app/services/katello/managed_content_medium_provider.rb
|
1404
1417
|
- app/services/katello/product_content_finder.rb
|
1405
1418
|
- app/services/katello/product_content_importer.rb
|
@@ -1446,6 +1459,8 @@ files:
|
|
1446
1459
|
- app/services/katello/pulp3/api/yum.rb
|
1447
1460
|
- app/services/katello/pulp3/content.rb
|
1448
1461
|
- app/services/katello/pulp3/content_view_version/export.rb
|
1462
|
+
- app/services/katello/pulp3/content_view_version/import.rb
|
1463
|
+
- app/services/katello/pulp3/content_view_version/import_export_common.rb
|
1449
1464
|
- app/services/katello/pulp3/distribution.rb
|
1450
1465
|
- app/services/katello/pulp3/docker_blob.rb
|
1451
1466
|
- app/services/katello/pulp3/docker_manifest.rb
|
@@ -1489,6 +1504,10 @@ files:
|
|
1489
1504
|
- app/services/katello/ui_notifications/subscriptions/manifest_import_success.rb
|
1490
1505
|
- app/services/katello/ui_notifications/subscriptions/manifest_refresh_error.rb
|
1491
1506
|
- app/services/katello/ui_notifications/subscriptions/manifest_refresh_success.rb
|
1507
|
+
- app/services/katello/ui_notifications/subscriptions/sca_disable_error.rb
|
1508
|
+
- app/services/katello/ui_notifications/subscriptions/sca_disable_success.rb
|
1509
|
+
- app/services/katello/ui_notifications/subscriptions/sca_enable_error.rb
|
1510
|
+
- app/services/katello/ui_notifications/subscriptions/sca_enable_success.rb
|
1492
1511
|
- app/services/katello/ui_notifications/task_notification.rb
|
1493
1512
|
- app/services/katello/upstream_connection_checker.rb
|
1494
1513
|
- app/views/common/400.html
|
@@ -1752,6 +1771,8 @@ files:
|
|
1752
1771
|
- app/views/overrides/activation_keys/_host_tab.html.erb
|
1753
1772
|
- app/views/overrides/activation_keys/_host_tab_pane.html.erb
|
1754
1773
|
- app/views/overrides/organizations/_edit_override.html.erb
|
1774
|
+
- app/views/overrides/organizations/_index_header_override.html.erb
|
1775
|
+
- app/views/overrides/organizations/_index_row_override.html.erb
|
1755
1776
|
- app/views/overrides/organizations/_step_1_override.html.erb
|
1756
1777
|
- app/views/overrides/smart_proxies/_download_policy.erb
|
1757
1778
|
- app/views/overrides/smart_proxies/_environment_tab.html.erb
|
@@ -4196,7 +4217,6 @@ files:
|
|
4196
4217
|
- engines/bastion_katello/app/assets/javascripts/bastion_katello/hosts/host-module-streams.factory.js
|
4197
4218
|
- engines/bastion_katello/app/assets/javascripts/bastion_katello/hosts/host-package.factory.js
|
4198
4219
|
- engines/bastion_katello/app/assets/javascripts/bastion_katello/hosts/host-subscription.factory.js
|
4199
|
-
- engines/bastion_katello/app/assets/javascripts/bastion_katello/hosts/host-traces-resolve.factory.js
|
4200
4220
|
- engines/bastion_katello/app/assets/javascripts/bastion_katello/hosts/host-traces.factory.js
|
4201
4221
|
- engines/bastion_katello/app/assets/javascripts/bastion_katello/hosts/host.factory.js
|
4202
4222
|
- engines/bastion_katello/app/assets/javascripts/bastion_katello/hosts/hosts.module.js
|
@@ -4989,11 +5009,11 @@ required_ruby_version: !ruby/object:Gem::Requirement
|
|
4989
5009
|
version: '0'
|
4990
5010
|
required_rubygems_version: !ruby/object:Gem::Requirement
|
4991
5011
|
requirements:
|
4992
|
-
- - "
|
5012
|
+
- - ">="
|
4993
5013
|
- !ruby/object:Gem::Version
|
4994
|
-
version:
|
5014
|
+
version: '0'
|
4995
5015
|
requirements: []
|
4996
|
-
rubygems_version: 3.
|
5016
|
+
rubygems_version: 3.1.4
|
4997
5017
|
signing_key:
|
4998
5018
|
specification_version: 4
|
4999
5019
|
summary: Content and Subscription Management plugin for Foreman
|
@@ -1,18 +0,0 @@
|
|
1
|
-
/**
|
2
|
-
* @ngdoc service
|
3
|
-
* @name Bastion.hosts.factory:HostTracesResolve
|
4
|
-
*
|
5
|
-
* @requires BastionResource
|
6
|
-
*
|
7
|
-
* @description
|
8
|
-
* Provides a BastionResource for resolving traces on a set of systems.
|
9
|
-
*/
|
10
|
-
angular.module('Bastion.hosts').factory('HostTracesResolve',
|
11
|
-
['BastionResource', function (BastionResource) {
|
12
|
-
|
13
|
-
return BastionResource('katello/api/v2/traces/:action', {}, {
|
14
|
-
resolve: {method: 'PUT', isArray: true, params: {action: 'resolve'}}
|
15
|
-
});
|
16
|
-
|
17
|
-
}]
|
18
|
-
);
|