katello 4.9.2 → 4.10.0.rc1

data/app/models/katello/content_view_version.rb

@@ -106,6 +106,10 @@ module Katello
       name
     end
 
+    def self.contains_file(file_unit_id)
+      where(id: Katello::Repository.where(id: Katello::RepositoryFileUnit.where(file_unit_id: file_unit_id).select(:repository_id)).select(:content_view_version_id))
+    end
+
     def ansible_collections
       AnsibleCollection.in_repositories(archived_repos)
     end

data/app/models/katello/host/content_facet.rb

@@ -61,6 +61,10 @@ module Katello
         self.cves_changed = true
       end
 
+      def mark_cves_unchanged
+        self.cves_changed = false
+      end
+
       def cves_changed?
         cves_changed
       end
@@ -299,11 +303,6 @@ module Katello
         end
       end
 
-      def katello_agent_installed?
-        self.host.installed_packages.where("#{Katello::InstalledPackage.table_name}.name" => 'katello-agent').any? ||
-          self.host.installed_debs.where("#{Katello::InstalledDeb.table_name}.name" => 'katello-agent').any?
-      end
-
       def tracer_installed?
         self.host.installed_packages.where("#{Katello::InstalledPackage.table_name}.name" => [ "python-#{HOST_TOOLS_TRACER_PACKAGE_NAME}",
                                                                                                "python3-#{HOST_TOOLS_TRACER_PACKAGE_NAME}",

data/app/models/katello/ping.rb

@@ -2,14 +2,12 @@ module Katello
   class Ping
     OK_RETURN_CODE = 'ok'.freeze
     FAIL_RETURN_CODE = 'FAIL'.freeze
-    PACKAGES = %w(katello candlepin pulp qpid foreman tfm hammer).freeze
 
     class << self
       def services(capsule_id = nil)
         proxy = fetch_proxy(capsule_id)
         services = [:candlepin, :candlepin_auth, :foreman_tasks, :katello_events, :candlepin_events]
         services += [:pulp3, :pulp3_content] if proxy&.pulp3_enabled?
-        services += [:katello_agent] if ::Katello.with_katello_agent?
         if proxy.nil? || proxy.has_feature?(SmartProxy::PULP_NODE_FEATURE) || proxy.has_feature?(SmartProxy::PULP_FEATURE)
           services += [:pulp, :pulp_auth]
         end
@@ -64,13 +62,6 @@ module Katello
         end
       end
 
-      def ping_katello_agent(result)
-        exception_watch(result) do
-          status = Katello::EventDaemon::Runner.service_status(:katello_agent_events)
-          event_daemon_status(status, result)
-        end
-      end
-
       def ping_pulp3_without_auth(service_result, capsule_id)
         exception_watch(service_result) do
           Katello::Ping.pulp3_without_auth(fetch_proxy(capsule_id).pulp3_url)
@@ -151,13 +142,6 @@ module Katello
         result
       end
 
-      # get package information for katello and its components
-      def packages
-        names = PACKAGES.join("|")
-        packages = `rpm -qa | egrep "#{names}"`
-        packages.split("\n").sort
-      end
-
       def pulp_url(capsule_id)
         proxy = fetch_proxy(capsule_id)
         uri = URI.parse(proxy.pulp_url)
@@ -233,7 +217,6 @@ module Katello
         end
       end
 
-      # rubocop:disable Metrics/CyclomaticComplexity
       def ping_services_for_capsule(services, capsule_id)
         services ||= self.services(capsule_id)
         result = {}
@@ -249,14 +232,12 @@ module Katello
         ping_foreman_tasks(result[:foreman_tasks]) if result.include?(:foreman_tasks)
         ping_katello_events(result[:katello_events]) if result.include?(:katello_events)
         ping_candlepin_events(result[:candlepin_events]) if result.include?(:candlepin_events)
-        ping_katello_agent(result[:katello_agent]) if result.include?(:katello_agent)
 
         # set overall status result code
         result = {:services => result}
         result[:status] = result[:services].each_value.any? { |v| v[:status] == FAIL_RETURN_CODE } ? FAIL_RETURN_CODE : OK_RETURN_CODE
         result
       end
-      # rubocop:enable Metrics/CyclomaticComplexity
 
       def fetch_proxy(capsule_id)
         capsule_id ? SmartProxy.unscoped.find(capsule_id) : SmartProxy.pulp_primary

data/app/models/katello/repository.rb

@@ -178,7 +178,7 @@ module Katello
              :upstream_authentication_token, :deb_releases,
              :deb_components, :deb_architectures, :ssl_ca_cert_id, :ssl_ca_cert, :ssl_client_cert, :ssl_client_cert_id,
              :ssl_client_key_id, :os_versions, :ssl_client_key, :ignorable_content, :description, :include_tags, :exclude_tags,
-             :docker_tags_whitelist, :ansible_collection_requirements, :ansible_collection_auth_url, :ansible_collection_auth_token,
+             :ansible_collection_requirements, :ansible_collection_auth_url, :ansible_collection_auth_token,
              :http_proxy_policy, :http_proxy_id, :to => :root
 
     delegate :content_id, to: :root, allow_nil: true
@@ -947,6 +947,10 @@ module Katello
       content_view.repositories.include? self
     end
 
+    def sync_status
+      return latest_dynflow_sync
+    end
+
     protected
 
     def unit_type_for_removal(type_class = nil)

data/app/models/katello/root_repository.rb

@@ -3,7 +3,6 @@ module Katello
   class RootRepository < Katello::Model
     audited :except => [:content_id]
     serialize :ignorable_content
-    serialize :docker_tags_whitelist
     serialize :include_tags
     serialize :exclude_tags
     serialize :os_versions
@@ -360,11 +359,6 @@ module Katello
       Katello::Content.find_by(:cp_content_id => self.content_id, :organization_id => self.product.organization_id)
     end
 
-    # For API support during deprecation period.
-    def docker_tags_whitelist
-      include_tags
-    end
-
     def docker?
       self.content_type == Repository::DOCKER_TYPE
     end
@@ -406,8 +400,8 @@ module Katello
     end
 
     def pulp_update_needed?
-      changeable_attributes = %w(url unprotected checksum_type docker_upstream_name download_policy mirroring_policy verify_ssl_on_sync
-                                 upstream_username upstream_password ignorable_content retain_package_versions_count
+      changeable_attributes = %w(url unprotected checksum_type docker_upstream_name download_policy verify_ssl_on_sync
+                                 upstream_username upstream_password retain_package_versions_count
                                  ssl_ca_cert_id ssl_client_cert_id ssl_client_key_id http_proxy_policy http_proxy_id download_concurrency)
       changeable_attributes += %w(name container_repository_name include_tags exclude_tags) if docker?
       changeable_attributes += %w(deb_releases deb_components deb_architectures gpg_key_id) if deb?

data/app/services/katello/applicability/applicable_content_helper.rb

@@ -133,13 +133,13 @@ module Katello
       end
 
       def newest_distinct_installed_packages_query
-        "SELECT DISTINCT ON (katello_installed_packages.name) katello_installed_packages.id " \
+        "SELECT DISTINCT ON (katello_installed_packages.name, katello_installed_packages.arch) katello_installed_packages.id " \
           "FROM katello_installed_packages INNER JOIN " \
           "katello_host_installed_packages ON " \
           "katello_installed_packages.id = " \
           "katello_host_installed_packages.installed_package_id " \
           "WHERE katello_host_installed_packages.host_id = " \
-          "#{content_facet.host.id} ORDER BY katello_installed_packages.name, katello_installed_packages.evr DESC"
+          "#{content_facet.host.id} ORDER BY katello_installed_packages.name, katello_installed_packages.arch, katello_installed_packages.evr DESC"
       end
 
       def applicable_differences

data/app/services/katello/registration_manager.rb

@@ -135,8 +135,6 @@ module Katello
         # if this fails, there is not much to do about it right now. We can't really re-create the candlepin consumer.
         # This can be cleaned up later via clean_backend_objects.
 
-        delete_agent_queue(host) if host.content_facet.try(:uuid)
-
         host.subscription_facet.try(:destroy!)
 
         if unregistering
@@ -281,16 +279,6 @@ module Katello
         Rails.logger.warn(_("Candlepin consumer %s has already been removed") % host_uuid)
       end
 
-      def delete_agent_queue(host)
-        return unless ::Katello.with_katello_agent?
-
-        queue_name = Katello::Agent::Dispatcher.host_queue_name(host)
-        Katello::EventQueue.push_event(::Katello::Events::DeleteHostAgentQueue::EVENT_TYPE, host.id) do |attrs|
-          attrs[:metadata] = { queue_name: queue_name }
-          attrs[:process_after] = 10.minutes.from_now
-        end
-      end
-
       def populate_content_facet(host, content_view_environments, uuid)
         content_facet = host.content_facet || ::Katello::Host::ContentFacet.new(:host => host)
         content_facet.content_view_environments = content_view_environments
@@ -317,6 +305,8 @@ module Katello
           host.content_facet.uuid = nil
           host.content_facet.content_view_environments = []
           host.content_facet.save!
+          Rails.logger.debug "remove_host_artifacts: marking CVEs unchanged to prevent backend update"
+          host.content_facet.mark_cves_unchanged
           host.content_facet.calculate_and_import_applicability
         end
 

data/app/views/foreman/job_templates/configure_host_for_new_content_source.erb

@@ -0,0 +1,25 @@
+<%#
+kind: job_template
+name: Configure host for new content source
+job_category: Katello
+model: JobTemplate
+provider_type: script
+description_format: Configure subscription manager for new content source
+feature: katello_change_content_source
+%>
+#!/bin/sh
+
+# This job template alone will NOT change a host's content source!
+# It is invoked after changing a host's content source on the server,
+# which is done from the Change Content Source page in the web UI.
+
+<%= configure_host_for_new_content_source(@host, foreman_server_ca_cert) %>
+
+# If REX pull mode is enabled, update yggdrasil config to pull from the new content source.
+# If host is not configured for REX pull mode, this is a noop.
+
+if [ -f /etc/yggdrasil/config.toml ]; then
+  cp /etc/yggdrasil/config.toml /etc/yggdrasil/config.toml.bak
+  export YGGDRASIL_RESTART_DELAY=10
+  <%= snippet 'remote_execution_pull_setup' %>
+fi

data/app/views/katello/api/v2/capsule_content/sync_status.json.rabl

@@ -38,7 +38,7 @@ child @lifecycle_environments => :lifecycle_environments do
           :label => content_view.label,
           :name => content_view.name,
           :composite => content_view.composite,
-          :last_published => content_view.versions.empty? ? nil : content_view.versions.last.created_at,
+          :last_published => content_view.versions.empty? ? nil : content_view.versions.in_environment(env).first&.created_at,
           :default => content_view.default,
           :up_to_date => @capsule.repos_pending_sync(env, content_view).empty?,
           :counts => {

data/app/views/katello/api/v2/content_facet/show.json.rabl

@@ -21,22 +21,10 @@ child :content_facet => :content_facet_attributes do
     content_facet.single_lifecycle_environment&.library? || false
   end
 
-  node :katello_agent_installed do |content_facet|
-    content_facet.katello_agent_installed?
-  end
-
   node :katello_tracer_installed do |content_facet|
     content_facet.tracer_installed?
   end
 
-  node :katello_agent_enabled do
-    Katello.with_katello_agent?
-  end
-
-  node :remote_execution_by_default do
-    Katello.remote_execution_by_default?
-  end
-
   user = User.current # current_user is not available here
   child :permissions do
     node(:view_lifecycle_environments) { user.can?("view_lifecycle_environments") }

data/app/views/katello/api/v2/content_view_components/show.json.rabl

@@ -29,5 +29,8 @@ child :latest_version => :content_view_version do
 end
 
 child :component_content_view_versions => :component_content_view_versions do
-  attributes :id, :version
+  attributes :id, :version, :description
+  node :published_at_words do |version|
+    time_ago_in_words(version.created_at)
+  end
 end

data/app/views/katello/api/v2/content_views/base.json.rabl

@@ -44,7 +44,7 @@ node :environments do |cv|
     {
       id: env.id,
       label: env.label,
-      name: env.label,
+      name: env.name,
       activation_keys: cv&.activation_keys&.in_environment(env)&.ids,
       hosts: cv&.hosts&.in_environments([env])&.ids,
       permissions: {readable: env.readable?}
@@ -64,11 +64,15 @@ else
   attributes :repository_ids
 end
 
-child :versions => :versions do
+child :sorted_versions => :versions do
   attributes :id, :version
   attributes :created_at => :published
+  attributes :description
   attributes :environment_ids
   attributes :filters_applied? => :filters_applied
+  node :published_at_words do |version|
+    time_ago_in_words(version.created_at)
+  end
 end
 
 if params.key?(:include_permissions)

data/app/views/katello/api/v2/repositories/show.json.rabl

@@ -7,7 +7,6 @@ extends 'katello/api/v2/repositories/base'
 glue(@resource.root) do
   attributes :content_type
   attributes :docker_upstream_name
-  attributes :docker_tags_whitelist
   attributes :include_tags
   attributes :exclude_tags
   attributes :verify_ssl_on_sync

data/config/initializers/monkeys.rb

@@ -2,3 +2,4 @@
 require 'monkeys/anemone'
 require 'monkeys/ar_postgres_evr_t'
 require 'monkeys/fx_sqlite_skip'
+require 'monkeys/remove_hidden_distribution'

data/config/katello.yaml.example

@@ -39,10 +39,6 @@
     :upload_chunk_size: 1048575 # upload size in bytes to pulp. see SSLRenegBufferSize in apache
     :skip_checksum_validation: false
 
-  :qpid:
-    :url: amqp:ssl:katello-devel.example.com:5671
-    :subscriptions_queue_address: katello_event_queue
-
 # Logging configuration can be changed by uncommenting the loggers
 # section and the logger configuration desired.
 #

data/config/routes/api/v2.rb

@@ -353,6 +353,8 @@ Katello::Engine.routes.draw do
         ##############################
         ##############################
 
+        match '/alternate_content_sources/bulk/refresh_all' => 'alternate_content_sources_bulk_actions#refresh_all_alternate_content_sources', :via => :post
+
         api_resources :alternate_content_sources, :only => [], :constraints => { :id => /[0-9a-zA-Z\-_.]*/ } do
           collection do
             match '/bulk/destroy' => 'alternate_content_sources_bulk_actions#destroy_alternate_content_sources', :via => :put
@@ -484,6 +486,7 @@ Katello::Engine.routes.draw do
         end
 
         api_resources :sync_plans, :only => [:index, :show, :update, :destroy] do
+          api_resources :products, :only => [:index]
           get :auto_complete_search, :on => :collection
           put :sync
         end

data/config/routes/overrides.rb

@@ -52,7 +52,6 @@ Foreman::Application.routes.draw do
         resources :hosts, :only => [] do
           resources :errata, :only => [:show, :index], :controller => :host_errata do
             collection do
-              put :apply
               get :auto_complete_search
               put :applicability
             end
@@ -69,11 +68,8 @@ Foreman::Application.routes.draw do
             match '/bulk/auto_attach' => 'hosts_bulk_actions#auto_attach', :via => :put
             match '/bulk/content_overrides' => 'hosts_bulk_actions#content_overrides', :via => :put
 
-            match '/bulk/install_content' => 'hosts_bulk_actions#install_content', :via => :put
             match '/bulk/applicable_errata' => 'hosts_bulk_actions#applicable_errata', :via => :post
             match '/bulk/installable_errata' => 'hosts_bulk_actions#installable_errata', :via => :post
-            match '/bulk/update_content' => 'hosts_bulk_actions#update_content', :via => :put
-            match '/bulk/remove_content' => 'hosts_bulk_actions#remove_content', :via => :put
             match '/bulk/destroy' => 'hosts_bulk_actions#destroy_hosts', :via => :put
             match '/bulk/environment_content_view' => 'hosts_bulk_actions#environment_content_view', :via => :put
             match '/bulk/release_version' => 'hosts_bulk_actions#release_version', :via => :put
@@ -88,13 +84,6 @@ Foreman::Application.routes.draw do
 
           resources :packages, :only => [:index], :controller => :host_packages do
             get :auto_complete_search, :on => :collection
-
-            collection do
-              put :remove
-              put :install
-              put :upgrade
-              put :upgrade_all
-            end
           end
 
           resources :module_streams, :only => [:index], :controller => :host_module_streams do

data/db/migrate/20230609155411_add_custom_cdn_auth_enabled_to_katello_cdn_configurations.rb

@@ -0,0 +1,5 @@
+class AddCustomCdnAuthEnabledToKatelloCdnConfigurations < ActiveRecord::Migration[6.1]
+  def change
+    add_column :katello_cdn_configurations, :custom_cdn_auth_enabled, :boolean, default: false
+  end
+end

data/db/migrate/20230710190626_remove_relative_path_limit.rb

@@ -0,0 +1,5 @@
+class RemoveRelativePathLimit < ActiveRecord::Migration[6.1]
+  def change
+    change_column :katello_repositories, :relative_path, :text
+  end
+end

data/db/migrate/20230717150442_change_change_content_source_job_template_name.rb

@@ -0,0 +1,20 @@
+class ChangeChangeContentSourceJobTemplateName < ActiveRecord::Migration[6.1]
+  TEMPLATE_NAMES = {
+    "Change content source" => "Configure host for new content source"
+  }.freeze
+
+  def up
+    TEMPLATE_NAMES.each do |from, to|
+      token = SecureRandom.base64(5)
+      ::Template.unscoped.find_by(name: to)&.update_columns(:name => "#{to} Backup #{token}")
+      ::Template.unscoped.find_by(name: from)&.update_columns(:name => to)
+    end
+  end
+
+  def down
+    TEMPLATE_NAMES.each do |from, to|
+      ::Template.unscoped.find_by(name: from)&.delete
+      ::Template.unscoped.find_by(name: to)&.update_columns(:name => from)
+    end
+  end
+end

data/db/migrate/20230828143236_remove_katello_agent_dispatch_history.rb

@@ -0,0 +1,15 @@
+class RemoveKatelloAgentDispatchHistory < ActiveRecord::Migration[6.1]
+  def up
+    drop_table :katello_agent_dispatch_histories
+  end
+
+  def down
+    create_table :katello_agent_dispatch_histories do |t|
+      t.integer :host_id, null: false, foreign_key: true
+      t.datetime :accepted_at
+      t.string :dynflow_execution_plan_id
+      t.integer :dynflow_step_id
+      t.text :result
+    end
+  end
+end

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

@@ -9,7 +9,6 @@ UpgradeTask.define_tasks(:katello) do
     {:name => 'katello:upgrades:4.2:remove_checksum_values'},
     {:name => 'katello:upgrades:4.4:publish_import_cvvs'},
     {:name => 'katello:upgrades:4.8:fix_incorrect_providers'},
-    {:name => 'katello:upgrades:4.8:regenerate_imported_repository_metadata'},
-    {:name => 'katello:upgrades:4.9:update_custom_products_enablement'}
+    {:name => 'katello:upgrades:4.8:regenerate_imported_repository_metadata'}
   ]
 end

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

@@ -25,7 +25,6 @@
     angular.module('Bastion').value('deleteHostOnUnregister', angular.fromJson(`<%= Setting[:unregister_delete_host] %>`));
     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] %>");
     angular.module('Bastion').constant('BastionConfig', angular.fromJson(`<%= Bastion.config.to_json.html_safe %>`));
     angular.module('Bastion.auth').value('CurrentUser', {
         id: <%= User.current.id %>,
@@ -33,6 +32,7 @@
     });
     angular.module('Bastion.auth').value('Permissions', angular.fromJson(`<%= User.current.cached_roles.collect { |role| role.permissions }.flatten.to_json.html_safe %>`));
     angular.module('Bastion').value('newHostDetailsUI', "<%= Setting[:host_details_ui] %>");
+    angular.module('Bastion').value('experimentalLabsSetting', "<%= Setting[:lab_features] %>");
   </script>
   <% Bastion.plugins.each do |name, plugin| %>
     <%= include_plugin_js(plugin) %>

data/engines/bastion_katello/README.md

@@ -7,7 +7,8 @@ The only real difference, as far as the user is concerned, is that the applicati
 # Running tests:
 
 ```
-sudo yum -y install npm chromium-headless chromium
+sudo dnf -y install epel-release epel-next-release
+sudo dnf -y install npm chromium-headless chromium
 cd ./engines/bastion_katello
 sudo npm install -g grunt-cli
 npm install

data/engines/bastion_katello/app/assets/javascripts/bastion_katello/activation-keys/activation-keys.controller.js

@@ -8,6 +8,7 @@
  * @requires Nutupane
  * @requires ActivationKey
  * @requires CurrentOrganization
+ * @requires experimentalLabsSetting
  *
  * @description
  *   Provides the functionality specific to activation keys for use with the Nutupane UI pattern.
@@ -15,8 +16,8 @@
  *   within the table.
  */
 angular.module('Bastion.activation-keys').controller('ActivationKeysController',
-    ['$scope', '$location', 'translate', 'Nutupane', 'ActivationKey', 'CurrentOrganization',
-    function ($scope, $location, translate, Nutupane, ActivationKey, CurrentOrganization) {
+    ['$scope', '$location', 'translate', 'Nutupane', 'ActivationKey', 'CurrentOrganization', 'experimentalLabsSetting',
+    function ($scope, $location, translate, Nutupane, ActivationKey, CurrentOrganization, experimentalLabsSetting) {
 
         var params = {
             'organization_id': CurrentOrganization,
@@ -30,5 +31,6 @@ angular.module('Bastion.activation-keys').controller('ActivationKeysController',
         $scope.controllerName = 'katello_activation_keys';
         nutupane.primaryOnly = true;
         $scope.table = nutupane.table;
+        $scope.experimentalLabsSetting = experimentalLabsSetting;
     }]
 );

data/engines/bastion_katello/app/assets/javascripts/bastion_katello/activation-keys/details/views/activation-key-associations-content-hosts.html

@@ -37,8 +37,8 @@
             <span ng-class="getHostStatusIcon(host.subscription_global_status)">
             </span>
           </td>
-          <td bst-table-cell>{{ host.content_facet_attributes.lifecycle_environment_name }}</td>
-          <td bst-table-cell>{{ host.content_facet_attributes.content_view_name || "" }}</td>
+          <td bst-table-cell>{{ host.content_facet_attributes.lifecycle_environment.name }}</td>
+          <td bst-table-cell>{{ host.content_facet_attributes.content_view.name || "" }}</td>
           <td bst-table-cell>{{ host.subscription_facet_attributes.service_level }}</td>
           <td bst-table-cell>{{ host.subscription_facet_attributes.release_version }}</td>
         </tr>

data/engines/bastion_katello/app/assets/javascripts/bastion_katello/activation-keys/views/activation-keys.html

@@ -35,9 +35,14 @@
       <tbody>
       <tr bst-table-row ng-repeat="activationKey in table.rows">
         <td bst-table-cell>
-          <a ui-sref="activation-key.info({activationKeyId: activationKey.id})">
-            {{ activationKey.name }}
-          </a>
+          <span ng-switch="experimentalLabsSetting">
+            <a ng-switch-when="true" ng-href="/labs/activation_keys/{{activationKey.id}}">
+              {{ activationKey.name }}
+            </a>
+            <a ng-switch-when="false" ui-sref="activation-key.info({activationKeyId: activationKey.id})">
+              {{ activationKey.name }}
+            </a>
+          </span>
           <i class="fa fa-chevron-right selected-icon" ng-show="activationKey.selected"></i>
         </td>
         <td bst-table-cell>{{ activationKey | activationKeyConsumedFilter }}</td>

data/engines/bastion_katello/app/assets/javascripts/bastion_katello/content-hosts/bulk/content-hosts-bulk-errata-modal.controller.js

@@ -24,21 +24,6 @@
 angular.module('Bastion.content-hosts').controller('ContentHostsBulkErrataModalController',
     ['$scope', '$http', '$location', '$window', '$timeout', '$uibModalInstance', 'HostBulkAction', 'HostCollection', 'Nutupane', 'CurrentOrganization', 'Erratum', 'Notification', 'BastionConfig', 'hostIds', 'newHostDetailsUI',
     function ($scope, $http, $location, $window, $timeout, $uibModalInstance, HostBulkAction, HostCollection, Nutupane, CurrentOrganization, Erratum, Notification, BastionConfig, hostIds, newHostDetailsUI) {
-        function installParams() {
-            var params = hostIds;
-            params['content_type'] = 'errata';
-            params.content = _.map($scope.table.getSelected(), 'errata_id');
-
-            if ($scope.nutupane.table.allResultsSelected) {
-                params['install_all'] = true;
-            } else {
-                params['install_all'] = false;
-            }
-
-            params['organization_id'] = CurrentOrganization;
-            return params;
-        }
-
         function fetchErratum(errataId) {
             $scope.erratum = Erratum.get({id: errataId, 'organization_id': CurrentOrganization});
         }
@@ -55,8 +40,6 @@ angular.module('Bastion.content-hosts').controller('ContentHostsBulkErrataModalC
         $scope.table.initialLoad = false;
         $scope.initialLoad = true;
         $scope.remoteExecutionPresent = BastionConfig.remoteExecutionPresent;
-        $scope.remoteExecutionByDefault = BastionConfig.remoteExecutionByDefault;
-        $scope.katelloAgentPresent = BastionConfig.katelloAgentPresent;
         $scope.allHostsSelected = hostIds.allResultsSelected;
         $scope.hostToolingEnabled = BastionConfig.hostToolingEnabled;
         $scope.newHostDetailsUI = newHostDetailsUI;
@@ -92,43 +75,19 @@ angular.module('Bastion.content-hosts').controller('ContentHostsBulkErrataModalC
         };
 
         $scope.installErrata = function () {
-            if ($scope.remoteExecutionByDefault) {
-                $scope.installErrataViaRemoteExecution();
-
-            } else {
-                $scope.installErrataViaKatelloAgent(false);
-            }
-        };
-
-        $scope.installErrataViaKatelloAgent = function () {
-            var params = installParams();
-            HostBulkAction.installContent(params,
-              function (data) {
-                  $scope.nutupane.invalidate();
-                  $scope.ok();
-                  $scope.transitionTo('content-hosts.bulk-task', {taskId: data.id});
-              },
-              function (response) {
-                  angular.forEach(response.data.errors, function (error) {
-                      Notification.setErrorMessage(error);
-                  });
-              });
+            $scope.installErrataViaRemoteExecution();
         };
 
         $scope.selectedErrataIds = function () {
-            return $scope.nutupane.getAllSelectedResults('errata_id');
+            return $scope.table.getSelected();
         };
 
         $scope.installErrataViaRemoteExecution = function(customize) {
             var errataIds = $scope.selectedErrataIds();
-            $scope.errataActionFormValues.bulkErrataIds = angular.toJson(errataIds);
 
             $scope.errataActionFormValues.remoteAction = 'errata_install';
+            $scope.errataActionFormValues.bulkErrataIds = angular.toJson(errataIds);
             $scope.errataActionFormValues.customize = customize;
-
-            $timeout(function () {
-                angular.element('#errataActionForm').submit();
-            }, 0);
         };
 
         $scope.ok = function () {

data/engines/bastion_katello/app/assets/javascripts/bastion_katello/content-hosts/bulk/content-hosts-bulk-module-streams-modal.controller.js

@@ -34,7 +34,6 @@ angular.module('Bastion.content-hosts').controller('ContentHostsBulkModuleStream
         $scope.moduleStreamsNutupane.primaryOnly = true;
         $scope.table = $scope.moduleStreamsNutupane.table;
         $scope.remoteExecutionPresent = BastionConfig.remoteExecutionPresent;
-        $scope.remoteExecutionByDefault = BastionConfig.remoteExecutionByDefault;
 
         $scope.moduleStreamActionFormValues = {
             authenticityToken: $window.AUTH_TOKEN.replace(/"/g, ''),