katello 4.3.0.rc4 → 4.4.0.rc2

data/config/routes/overrides.rb

@@ -32,6 +32,8 @@ Foreman::Application.routes.draw do
     end
   end
 
+  post '/change_host_content_source/data', to: 'hosts#change_content_source_data'
+
   namespace :api do
     scope "(:api_version)", :module => :v2, :defaults => {:api_version => 'v2'}, :api_version => /v2/, :constraints => ApiConstraints.new(:version => 2, :default => true) do
       match '/hosts/post_index' => 'hosts#index', :via => :post
@@ -80,6 +82,7 @@ Foreman::Application.routes.draw do
             match '/bulk/system_purpose' => 'hosts_bulk_actions#system_purpose', :via => :put
             match '/bulk/available_incremental_updates' => 'hosts_bulk_actions#available_incremental_updates', :via => :post
             match '/bulk/module_streams' => 'hosts_bulk_actions#module_streams', :via => :post
+            match '/bulk/change_content_source' => 'hosts_bulk_actions#change_content_source', :via => :put
             match '/subscriptions/' => 'host_subscriptions#create', :via => :post
           end
 

data/config/routes.rb

@@ -42,4 +42,6 @@ Katello::Engine.routes.draw do
   match '/labs' => 'react#index', :via => [:get]
   match '/labs/*page' => 'react#index', :via => [:get]
   match '/organization_select' => 'react#index', :via => [:get]
+
+  get '/change_host_content_source', to: 'react#index'
 end

data/db/migrate/20150930183738_migrate_content_hosts.rb

@@ -38,7 +38,7 @@ class MigrateContentHosts < ActiveRecord::Migration[4.2]
     self.table_name = "katello_content_views"
 
     has_many :systems, :class_name => "MigrateContentHosts::System", :dependent => :restrict_with_exception
-    has_many :content_facets, :class_name => "MigrateContentHosts::ContentFacet", :foreign_key => :content_view_id,
+    has_many :content_facets, :class_name => "MigrateContentHosts::ContentFacet",
              :inverse_of => :content_view, :dependent => :restrict_with_exception
   end
 

data/db/migrate/20180612164926_add_content_org_id.rb

@@ -7,8 +7,8 @@ class AddContentOrgId < ActiveRecord::Migration[5.1]
 
   class FakeProductContent < Katello::Model
     self.table_name = 'katello_product_contents'
-    belongs_to :product, :class_name => 'Katello::Product', :foreign_key => 'product_id', :inverse_of => :product_contents
-    belongs_to :content, :class_name => 'FakeContent', :foreign_key => 'content_id', :inverse_of => :product_contents
+    belongs_to :product, :class_name => 'Katello::Product', :inverse_of => :product_contents
+    belongs_to :content, :class_name => 'FakeContent', :inverse_of => :product_contents
   end
 
   class FakeProduct < Katello::Model

data/db/migrate/20210119162528_delete_puppet_and_ostree_repos.rb

@@ -39,6 +39,8 @@ class DeletePuppetAndOstreeRepos < ActiveRecord::Migration[6.0]
     FakeContentViewPuppetEnvironment.delete_all
     FakePuppetModule.delete_all
 
+    ::Katello::RepositoryErratum.where(:repository_id => ::Katello::Repository.where(:root_id => ::Katello::RootRepository.where(:content_type => [:ostree, :puppet]))).delete_all
+
     if puppet_repositories.any?
       User.as_anonymous_admin do
         ::Katello::Repository.delete(puppet_repositories)

data/db/migrate/20211019192121_create_cdn_configuration.katello.rb

@@ -1,4 +1,8 @@
 class CreateCdnConfiguration < ActiveRecord::Migration[6.0]
+  class FakeCdnConfiguration < Katello::Model
+    self.table_name = 'katello_cdn_configurations'
+  end
+
   def up
     create_table :katello_cdn_configurations do |t|
       t.integer :organization_id
@@ -14,17 +18,22 @@ class CreateCdnConfiguration < ActiveRecord::Migration[6.0]
     add_foreign_key :katello_cdn_configurations, :taxonomies, name: 'katello_cdn_configurations_organization_id', column: :organization_id
     add_foreign_key :katello_cdn_configurations, :katello_content_credentials, name: 'katello_cdn_configurations_ssl_ca_credential_id', column: :ssl_ca_credential_id
 
+    FakeCdnConfiguration.reset_column_information
+
     ::Organization.all.each do |org|
-      Katello::CdnConfiguration.where(
-        organization: org,
+      FakeCdnConfiguration.where(
+        organization_id: org.id,
         url: org.redhat_provider.repository_url || ::Katello::Resources::CDN::CdnResource.redhat_cdn_url
       ).first_or_create!
     end
 
     remove_column :katello_providers, :repository_url
+    ::Katello::Provider.reset_column_information
   end
 
   def down
+    add_column :katello_providers, :repository_url, :string
+    ::Katello::Provider.reset_column_information
     drop_table :katello_cdn_configurations
   end
 end

data/db/migrate/20211201154845_add_unique_indexes.rb

@@ -0,0 +1,20 @@
+class AddUniqueIndexes < ActiveRecord::Migration[6.0]
+  def up
+    ::Katello::Util::DeduplicationMigrator.new.execute!
+    add_index :katello_capsule_lifecycle_environments, [:capsule_id, :lifecycle_environment_id], unique: true, name: 'katello_capsule_lifecycle_environments_unique_index'
+    add_index :katello_content_view_erratum_filter_rules, [:errata_id, :content_view_filter_id], unique: true, name: 'katello_content_view_erratum_filter_rules_unique_index'
+    add_index :katello_content_view_module_stream_filter_rules, [:module_stream_id, :content_view_filter_id], unique: true, name: 'katello_content_view_module_stream_filter_rules_unique_index'
+    add_index :katello_content_view_package_group_filter_rules, [:uuid, :content_view_filter_id], unique: true, name: 'katello_content_view_package_group_filter_rules_unique_index'
+    add_index :katello_content_view_repositories, [:content_view_id, :repository_id], unique: true, name: 'katello_content_view_repositories_unique_index'
+    add_index :katello_content_views, [:name, :organization_id], unique: true, name: 'katello_content_views_name_unique_index'
+  end
+
+  def down
+    remove_index :katello_capsule_lifecycle_environments, name: 'katello_capsule_lifecycle_environments_unique_index'
+    remove_index :katello_content_view_erratum_filter_rules, name: 'katello_content_view_erratum_filter_rules_unique_index'
+    remove_index :katello_content_view_module_stream_filter_rules, name: 'katello_content_view_module_stream_filter_rules_unique_index'
+    remove_index :katello_content_view_package_group_filter_rules, name: 'katello_content_view_package_group_filter_rules_unique_index'
+    remove_index :katello_content_view_repositories, name: 'katello_content_view_repositories_unique_index'
+    remove_index :katello_content_views, name: 'katello_content_views_name_unique_index'
+  end
+end

data/db/migrate/20211202172358_add_repository_mirroring_policy.rb

@@ -0,0 +1,26 @@
+class AddRepositoryMirroringPolicy < ActiveRecord::Migration[6.0]
+  def up
+    add_column :katello_root_repositories, :mirroring_policy, :string
+
+    #RH repos can handle COMPLETE always, but custom cannot, so lets migrate custom to 'MIRRORING_POLICY_CONTENT'
+    Katello::RootRepository.where(:content_type => 'yum').redhat.where(:mirror_on_sync => true).update_all(:mirroring_policy => ::Katello::RootRepository::MIRRORING_POLICY_COMPLETE)
+    Katello::RootRepository.where(:content_type => 'yum').custom.where(:mirror_on_sync => true).update_all(:mirroring_policy => ::Katello::RootRepository::MIRRORING_POLICY_CONTENT)
+
+    Katello::RootRepository.where.not(:content_type => 'yum').where(:mirror_on_sync => true).update_all(:mirroring_policy => ::Katello::RootRepository::MIRRORING_POLICY_CONTENT)
+    Katello::RootRepository.where(:mirror_on_sync => false).update_all(:mirroring_policy => ::Katello::RootRepository::MIRRORING_POLICY_ADDITIVE)
+
+    change_column :katello_root_repositories, :mirroring_policy, :string, :null => false
+    remove_column :katello_root_repositories, :mirror_on_sync
+  end
+
+  def down
+    add_column :katello_root_repositories, :mirror_on_sync, :boolean, default: true, null: true
+
+    Katello::RootRepository.where(:mirroring_policy => ::Katello::RootRepository::MIRRORING_POLICY_COMPLETE).update_all(:mirror_on_sync => true)
+    Katello::RootRepository.where(:mirroring_policy => ::Katello::RootRepository::MIRRORING_POLICY_CONTENT).update_all(:mirror_on_sync => true)
+    Katello::RootRepository.where(:mirroring_policy => ::Katello::RootRepository::MIRRORING_POLICY_ADDITIVE).update_all(:mirror_on_sync => false)
+    change_column :katello_root_repositories, :mirror_on_sync, :boolean, :null => false, :default => true
+
+    remove_column :katello_root_repositories, :mirroring_policy
+  end
+end

data/db/migrate/20211208034230_add_content_view_and_lifecycle_environment.rb

@@ -0,0 +1,6 @@
+class AddContentViewAndLifecycleEnvironment < ActiveRecord::Migration[6.0]
+  def change
+    add_column :katello_cdn_configurations, :upstream_content_view_label, :string
+    add_column :katello_cdn_configurations, :upstream_lifecycle_environment_label, :string
+  end
+end

data/db/migrate/20211220185935_clean_duplicate_content_units.rb

@@ -0,0 +1,144 @@
+class CleanDuplicateContentUnits < ActiveRecord::Migration[6.0]
+  def find_duplicate_groups(model, fields)
+    model.having("count(*) > 1").group(*fields).pluck("string_agg(id::TEXT, ',') ").map do |ids|
+      ids.split(',').map(&:to_i)
+    end
+  end
+
+  def reassign_duplicate_associations(associated_models, duplicates, new_id, field)
+    associated_models.each do |associated_model, unique_by|
+      associated_duplicates = associated_model.where(field => duplicates)
+      to_delete, to_update = filter_duplicates(associated_model, associated_duplicates, new_id, field, [unique_by])
+      to_delete.each(&:destroy) #use destroy to destroy child models if any
+      associated_model.where(id: to_update).update_all(field => new_id) if to_update.any?
+    end
+  end
+
+  #returns two lists, the first of duplicates that need deleting, and
+  # the 2nd of duplicates that need updating to the new_id
+  def filter_duplicates(model_class, duplicate_models, new_id, new_id_field, unique_fields)
+    to_delete = []
+    to_update = []
+    duplicate_models.each do |duplicate|
+      query = {new_id_field => new_id}
+      unique_fields.each do |field|
+        query[field] = duplicate.send(field)
+      end
+      if model_class.where(query).any?
+        to_delete << duplicate
+      else
+        to_update << duplicate
+      end
+    end
+    return to_delete, to_update
+  end
+
+  def remove_children(reference_attribute_name, ids, child_models)
+    child_models.each do |model|
+      model.where(reference_attribute_name => ids).delete_all
+    end
+  end
+
+  def handle_duplicate(model, reference_attribute_name, unique_by_fields, associated_models: [], child_models: [])
+    find_duplicate_groups(model, unique_by_fields).each do |duplicate_ids|
+      to_keep = duplicate_ids.sort!.shift
+
+      remove_children(reference_attribute_name, duplicate_ids, child_models)
+      reassign_duplicate_associations(associated_models, duplicate_ids, to_keep, reference_attribute_name)
+      model.where(id: duplicate_ids).delete_all
+    end
+  end
+
+  def up
+    handle_null_pulp_ids
+    add_foreign_keys
+
+    handle_duplicate(Katello::ModuleStream,
+                     'module_stream_id',
+                     [:pulp_id],
+                     associated_models: {Katello::RepositoryModuleStream => :repository_id},
+                     child_models: [Katello::ContentViewModuleStreamFilterRule,
+                                    Katello::ContentFacetApplicableModuleStream,
+                                    Katello::ModuleProfile,
+                                    Katello::ModuleStreamArtifact,
+                                    Katello::ModuleStreamErratumPackage,
+                                    Katello::ModuleStreamRpm])
+    add_index :katello_module_streams, :pulp_id, :unique => true
+
+    handle_duplicate(Katello::ModuleProfile, 'module_profile_id', [:module_stream_id, :name],
+                     child_models: [Katello::ModuleProfileRpm])
+    add_index :katello_module_profiles, [:module_stream_id, :name], :unique => true
+
+    handle_duplicate(Katello::ModuleProfileRpm, 'module_profile_rpm_id', [:module_profile_id, :name])
+    add_index :katello_module_profile_rpms, [:module_profile_id, :name], :unique => true
+
+    handle_duplicate(Katello::AnsibleTag, 'ansible_tag_id', [:name],
+                     associated_models: {Katello::AnsibleCollectionTag => :ansible_collection_id})
+    add_index :katello_ansible_tags, [:name], :unique => true
+
+    handle_duplicate(Katello::AnsibleCollectionTag, 'ansible_collection_tag_id', [:ansible_collection_id, :ansible_tag_id])
+    add_index :katello_ansible_collection_tags, [:ansible_collection_id, :ansible_tag_id], :unique => true,
+              :name => 'katello_ans_coll_tags_coll_id_tag_id'
+
+    handle_duplicate(Katello::GenericContentUnit,
+                     'generic_content_unit_id',
+                     [:pulp_id],
+                     associated_models: {Katello::RepositoryGenericContentUnit => :repository_id})
+    add_index :katello_generic_content_units, :pulp_id, :unique => true
+
+    handle_duplicate(Katello::DockerManifestList, 'docker_manifest_list_id', [:pulp_id],
+                     associated_models: {
+                       Katello::DockerManifestListManifest => :docker_manifest_id,
+                       Katello::RepositoryDockerManifestList => :repository_id
+                     })
+    add_index :katello_docker_manifest_lists, :pulp_id, :unique => true
+
+    handle_duplicate(Katello::DockerManifest, 'docker_manifest_id', [:pulp_id],
+                     associated_models: {
+                       Katello::DockerManifestListManifest => :docker_manifest_list_id,
+                       Katello::RepositoryDockerManifest => :repository_id
+                     })
+    add_index :katello_docker_manifests, :pulp_id, :unique => true
+  end
+
+  def handle_null_pulp_ids
+    Katello::DockerTag.where(:pulp_id => nil).destroy_all
+    change_column :katello_docker_tags, :pulp_id, :string, :null => false
+
+    Katello::DockerManifestList.where(:pulp_id => nil).destroy_all
+    change_column :katello_docker_manifest_lists, :pulp_id, :string, :null => false
+
+    Katello::DockerManifest.where(:pulp_id => nil).destroy_all
+    change_column :katello_docker_manifests, :pulp_id, :string, :null => false
+  end
+
+  def add_foreign_keys
+    Katello::DockerManifestListManifest.where.not(docker_manifest_list_id: Katello::DockerManifestList.pluck(:id)).delete_all
+    add_foreign_key :katello_docker_manifest_list_manifests, :katello_docker_manifest_lists, column: :docker_manifest_list_id
+
+    Katello::RepositoryDockerManifest.where.not(docker_manifest_id: Katello::DockerManifest.pluck(:id)).delete_all
+    add_foreign_key :katello_repository_docker_manifests, :katello_docker_manifests, column: :docker_manifest_id
+
+    Katello::RepositoryDockerManifestList.where.not(docker_manifest_list_id: Katello::DockerManifestList.pluck(:id)).delete_all
+    add_foreign_key :katello_repository_docker_manifest_lists, :katello_docker_manifest_lists, column: :docker_manifest_list_id
+  end
+
+  def down
+    remove_index :katello_module_streams, :pulp_id
+    remove_index :katello_module_profiles, [:module_stream_id, :name]
+    remove_index :katello_module_profile_rpms, [:module_profile_id, :name]
+    remove_index :katello_ansible_tags, :name
+    remove_index :katello_ansible_collection_tags, [:ansible_collection_id, :ansible_tag_id]
+    remove_index :katello_docker_manifests, :pulp_id
+    remove_index :katello_docker_manifest_lists, :pulp_id
+    remove_index :katello_generic_content_units, :pulp_id
+
+    remove_foreign_key :katello_repository_docker_manifest_lists, :katello_docker_manifest_lists
+    remove_foreign_key :katello_repository_docker_manifests, :katello_docker_manifests
+    remove_foreign_key :katello_docker_manifest_list_manifests, :katello_docker_manifest_lists
+
+    change_column :katello_docker_tags, :pulp_id, :string, :null => true
+    change_column :katello_docker_manifest_lists, :pulp_id, :string, :null => true
+    change_column :katello_docker_manifests, :pulp_id, :string, :null => true
+  end
+end

data/db/migrate/20220110223754_update_disconnected_settings.rb

@@ -0,0 +1,20 @@
+class UpdateDisconnectedSettings < ActiveRecord::Migration[6.0]
+  def up
+    setting_disconnected = Setting.find_by(name: 'content_disconnected', category: 'Setting::Content')
+    setting = Setting.find_by(name: 'subscription_connection_enabled', category: 'Setting::Content')
+
+    setting&.update!(
+      value: !setting_disconnected&.value
+    )
+    Setting.where(:name => 'content_disconnected', :category => 'Setting::Content').delete_all
+  end
+
+  def down
+    remove_column :katello_cdn_configurations, :airgapped
+    setting_disconnected = Setting.find_by(name: 'subscription_connection_enabled', category: 'Setting::Content')
+    Setting.set('content_disconnected', N_("A server operating in disconnected mode does not communicate with the Red Hat CDN."),
+               !setting_disconnected.value, N_('Disconnected mode'))
+
+    Setting.where(:name => 'subscription_connection_enabled', :category => 'Setting::Content').delete_all
+  end
+end

data/db/migrate/20220120163252_fix_docker_download_policy.rb

@@ -0,0 +1,11 @@
+class FixDockerDownloadPolicy < ActiveRecord::Migration[6.0]
+  def up
+    Katello::RootRepository.where(content_type: "docker")
+                           .where(download_policy: [nil, ""])
+                           .update_all(:download_policy => "immediate")
+  end
+
+  def down
+    fail ActiveRecord::IrreversibleMigration
+  end
+end

data/db/migrate/20220124191056_add_type_to_cdn_configuration.rb

@@ -0,0 +1,22 @@
+class AddTypeToCdnConfiguration < ActiveRecord::Migration[6.0]
+  def change
+    add_column :katello_cdn_configurations, :type, :string, default: ::Katello::CdnConfiguration::CDN_TYPE
+
+    ::Katello::CdnConfiguration.reset_column_information
+    ::Katello::CdnConfiguration.all.each do |config|
+      unless Setting[:subscription_connection_enabled]
+        # if subscription connection is not enabled
+        # the user most likely wants the type to be airgapped
+        config.update!(type: ::Katello::CdnConfiguration::AIRGAPPED_TYPE)
+        next
+      end
+
+      unless config.username.blank? ||
+             config.password.blank? ||
+             config.upstream_organization_label.blank? ||
+             config.ssl_ca_credential_id.blank?
+        config.update!(type: ::Katello::CdnConfiguration::UPSTREAM_SERVER_TYPE)
+      end
+    end
+  end
+end

data/db/migrate/20220127120843_fix_debian_download_policy.rb

@@ -0,0 +1,11 @@
+class FixDebianDownloadPolicy < ActiveRecord::Migration[6.0]
+  def up
+    Katello::RootRepository.where(content_type: "deb")
+                           .where(download_policy: [nil, ""])
+                           .update_all(:download_policy => "immediate")
+  end
+
+  def down
+    fail ActiveRecord::IrreversibleMigration
+  end
+end

data/db/migrate/20220204171908_rename_docker_tags_whitelist_and_add_exclude_tags.rb

@@ -0,0 +1,8 @@
+class RenameDockerTagsWhitelistAndAddExcludeTags < ActiveRecord::Migration[6.0]
+  def change
+    change_table :katello_root_repositories do |t|
+      t.rename :docker_tags_whitelist, :include_tags
+      t.text :exclude_tags
+    end
+  end
+end

data/db/migrate/20220207140355_change_deb_attributes_size_limit.rb

@@ -0,0 +1,7 @@
+class ChangeDebAttributesSizeLimit < ActiveRecord::Migration[6.0]
+  def change
+    change_column :katello_root_repositories, :deb_releases, :text
+    change_column :katello_root_repositories, :deb_components, :text
+    change_column :katello_root_repositories, :deb_architectures, :text
+  end
+end

data/db/migrate/20220209205137_expand_sync_timeout_settings.rb

@@ -0,0 +1,23 @@
+class ExpandSyncTimeoutSettings < ActiveRecord::Migration[6.0]
+  def up
+    old_timeout_setting = Setting.find_by(name: 'sync_connect_timeout', category: 'Setting::Content')
+    if old_timeout_setting && (old_timeout_setting&.value != old_timeout_setting&.default)
+      Setting.find_by(name: 'sync_total_timeout')&.update(value: old_timeout_setting&.value)
+      Setting.find_by(name: 'sync_sock_read_timeout')&.update(value: old_timeout_setting&.value)
+    end
+    Setting.where(name: 'sync_connect_timeout', category: 'Setting::Content').delete_all
+  end
+
+  def down
+    timeout = Setting.find_by(name: 'sync_total_timeout', category: 'Setting::Content')&.value
+
+    Setting.where(name: 'sync_total_timeout', category: 'Setting::Content').delete_all
+    Setting.where(name: 'sync_connect_timeout_v2', category: 'Setting::Content').delete_all
+    Setting.where(name: 'sync_sock_connect_timeout', category: 'Setting::Content').delete_all
+    Setting.where(name: 'sync_sock_read_timeout', category: 'Setting::Content').delete_all
+
+    Setting.create(Setting.set('sync_connect_timeout', N_("Timeout in seconds for downloads when syncing"),
+      300, N_('Sync Connection Timeout')))
+    Setting.find_by(name: 'sync_connect_timeout')&.update(value: timeout)
+  end
+end

data/db/seeds.d/111-upgrade_tasks.rb

@@ -6,6 +6,7 @@ UpgradeTask.define_tasks(:katello) do
     {:name => 'katello:upgrades:4.1:sync_noarch_content'},
     {:name => 'katello:upgrades:4.1:fix_invalid_pools'},
     {:name => 'katello:upgrades:4.1:reupdate_content_import_export_perms'},
-    {:name => 'katello:upgrades:4.2:remove_checksum_values'}
+    {:name => 'katello:upgrades:4.2:remove_checksum_values'},
+    {:name => 'katello:upgrades:4.4:publish_import_cvvs'}
   ]
 end

data/engines/bastion/app/views/bastion/layouts/application.html.erb

@@ -1,6 +1,5 @@
 
 <% content_for(:content) do %>
-  <%= notifications %>
   <div id="content" class="article maincontent bastion" data-no-turbolink="true">
     <section class="container-fluid">
         <div ui-view></div>

data/engines/bastion/app/views/bastion/layouts/assets.html.erb

@@ -22,7 +22,6 @@
     angular.module('Bastion').value('foreman', tfm);
     angular.module('Bastion').value('repositoryTypes', angular.fromJson('<%= Katello::RepositoryTypeManager.enabled_repository_types.values.to_json.html_safe %>'));
     angular.module('Bastion').value('deleteHostOnUnregister', angular.fromJson('<%= Setting[:unregister_delete_host] %>'));
-    angular.module('Bastion').value('contentDisconnected', angular.fromJson('<%= Setting[:content_disconnected] %>'));
     angular.module('Bastion').value('globalContentProxy', angular.fromJson('<%= Setting[:content_default_http_proxy].empty? ? nil.to_json : Setting[:content_default_http_proxy].to_json.html_safe %>'));
     angular.module('Bastion').value('entriesPerPage', "<%= Setting[:entries_per_page] %>");
     angular.module('Bastion').value('contentViewSolveDependencies', "<%= Setting[:content_view_solve_dependencies] %>");

data/engines/bastion_katello/app/assets/javascripts/bastion_katello/content-credentials/content-credentials.controller.js

@@ -25,7 +25,7 @@ angular.module('Bastion.content-credentials').controller('ContentCredentialsCont
         };
 
         var nutupane = new Nutupane(ContentCredential, params);
-        $scope.controllerName = 'katello_gpg_keys';
+        $scope.controllerName = 'katello_content_credentials';
         $scope.table = nutupane.table;
         $scope.panel = {loading: false};
         $scope.removeRow = nutupane.removeRow;

data/engines/bastion_katello/app/assets/javascripts/bastion_katello/content-credentials/details/content-credential-products.controller.js

@@ -15,7 +15,7 @@
         var nutupane = new Nutupane(ContentCredential, {
             id: $scope.$stateParams.contentCredentialId
         }, 'products');
-        $scope.controllerName = 'katello_gpg_keys';
+        $scope.controllerName = 'katello_content_credentials';
         nutupane.primaryOnly = true;
 
         $scope.panel = $scope.panel || {error: false, loading: false};

data/engines/bastion_katello/app/assets/javascripts/bastion_katello/content-credentials/details/content-credential-repositories.controller.js

@@ -15,7 +15,7 @@
         var nutupane = new Nutupane(ContentCredential, {
             id: $scope.$stateParams.contentCredentialId
         }, 'repositories');
-        $scope.controllerName = 'katello_gpg_keys';
+        $scope.controllerName = 'katello_content_credentials';
         nutupane.primaryOnly = true;
 
         $scope.panel = $scope.panel || {error: false, loading: false};

data/engines/bastion_katello/app/assets/javascripts/bastion_katello/content-hosts/bulk/views/content-hosts-bulk-traces-modal.html

@@ -23,7 +23,7 @@
           <div data-block="modal-body">
             <span translate>Are you sure you want to restart the services on the selected content hosts?</span>
             <span ng-show="rebootRequired()">
-              <strong translate>Resolving the selected Traces will reboot this host.</strong>
+              <strong translate>Resolving the selected Traces will reboot the selected content hosts.</strong>
             </span>
           </div>
           <span data-block="modal-confirm-button">

data/engines/bastion_katello/app/assets/javascripts/bastion_katello/environments/details/views/environment.html

@@ -7,11 +7,36 @@
 
   <div data-block="item-actions">
     <button ng-show="!environment.library"
-            ng-click="remove(environment)"
+            ng-click="openModal()"
             type="button"
             class="btn btn-default">
       <span translate>Remove Environment</span>
     </button>
+    <div bst-modal="remove(environment)" model="environment">
+      <div data-block="modal-header" translate>Remove environment {{ environment.name }}?</div>
+      <div data-block="modal-body">
+        <div ng-show="environment.content_views.length" style="margin-bottom: 1em">
+          <span translate>Environment will also be removed from the following published content views!</span>
+          <table class="table table-striped table-bordered" style="margin-top: 1em">
+              <thead>
+                  <tr>
+                      <th translate>Content View</th>
+                  </tr>
+              </thead>
+              <tbody>
+                <tr ng-repeat="cv in environment.content_views">
+                  <td class="align-center">
+                      <a href="/content_views/{{cv['id']}}" target="_blank">
+                          {{cv['name']}}
+                      </a>
+                  </td>
+                </tr>
+              </tbody>
+          </table>
+        </div>
+        <span translate>Are you sure you want to remove environment {{ environment.name }}?</span>
+      </div>
+    </div>
   </div>
 
   <nav data-block="navigation">

data/engines/bastion_katello/app/assets/javascripts/bastion_katello/errata/apply-errata.controller.js

@@ -10,13 +10,14 @@
  * @requires ContentViewVersion
  * @requires CurrentOrganization
  * @requires Notification
+ * @requires BastionConfig
  *
  * @description
  *   Display confirmation screen and apply Errata.
  */
 angular.module('Bastion.errata').controller('ApplyErrataController',
-    ['$scope', '$window', 'translate', 'IncrementalUpdate', 'HostBulkAction', 'ContentViewVersion', 'CurrentOrganization', 'Notification',
-        function ($scope, $window, translate, IncrementalUpdate, HostBulkAction, ContentViewVersion, CurrentOrganization, Notification) {
+    ['$scope', '$window', 'translate', 'IncrementalUpdate', 'HostBulkAction', 'ContentViewVersion', 'CurrentOrganization', 'Notification', 'BastionConfig',
+        function ($scope, $window, translate, IncrementalUpdate, HostBulkAction, ContentViewVersion, CurrentOrganization, Notification, BastionConfig) {
             var applyErrata, incrementalUpdate;
 
             function transitionToTask(task) {
@@ -31,6 +32,8 @@ angular.module('Bastion.errata').controller('ApplyErrataController',
 
             $scope.applyingErrata = false;
 
+            $scope.remoteExecutionPresent = BastionConfig.remoteExecutionPresent;
+            $scope.remoteExecutionByDefault = BastionConfig.remoteExecutionByDefault;
             $scope.errataActionFormValues = {
                 authenticityToken: $window.AUTH_TOKEN.replace(/"/g, ''),
                 errata: IncrementalUpdate.getErrataIds().join(','),
@@ -133,7 +136,11 @@ angular.module('Bastion.errata').controller('ApplyErrataController',
             $scope.confirmApply = function() {
                 $scope.applyingErrata = true;
                 if ($scope.updates.length === 0) {
-                    applyErrata();
+                    if ($scope.remoteExecutionPresent && $scope.remoteExecutionByDefault) {
+                        angular.element('#errataActionForm').submit();
+                    } else {
+                        applyErrata();
+                    }
                 } else {
                     incrementalUpdate();
                 }