katello 4.9.1 → 4.10.0.rc2

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, ''),

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

@@ -21,32 +21,7 @@ angular.module('Bastion.content-hosts').controller('ContentHostsBulkPackagesModa
     ['$scope', '$location', '$timeout', '$window', '$uibModalInstance', 'HostBulkAction', 'CurrentOrganization', 'translate', 'Notification', 'BastionConfig', 'hostIds',
     function ($scope, $location, $timeout, $window, $uibModalInstance, HostBulkAction, CurrentOrganization, translate, Notification, BastionConfig, hostIds) {
 
-        function successMessage(type) {
-            var messages = {
-                install: translate("Successfully scheduled package installation"),
-                update: translate("Successfully scheduled package update"),
-                remove: translate("Successfully scheduled package removal"),
-                "update all": translate("Successfully scheduled an update of all packages")
-            };
-            return messages[type];
-        }
-
-        function installParams() {
-            var params = hostIds;
-            params['content_type'] = $scope.content.contentType;
-            if ($scope.content.action === "update all") {
-                params['update_all'] = true;
-                params.content = null;
-            } else {
-                params.content = $scope.content.content.split(/ *, */);
-            }
-            params['organization_id'] = CurrentOrganization;
-            return params;
-        }
-
         $scope.remoteExecutionPresent = BastionConfig.remoteExecutionPresent;
-        $scope.remoteExecutionByDefault = BastionConfig.remoteExecutionByDefault;
-        $scope.katelloAgentPresent = BastionConfig.katelloAgentPresent;
         $scope.hostToolingEnabled = BastionConfig.hostToolingEnabled;
 
         $scope.packageActionFormValues = {
@@ -74,46 +49,7 @@ angular.module('Bastion.content-hosts').controller('ContentHostsBulkPackagesModa
         };
 
         $scope.performContentAction = function () {
-            if ($scope.remoteExecutionByDefault) {
-                $scope.performViaRemoteExecution();
-            } else {
-                $scope.performViaKatelloAgent();
-            }
-        };
-
-        $scope.performViaKatelloAgent = function (action, actionInput) {
-            var success, error, params;
-
-            if (action) {
-                $scope.content.action = action;
-            }
-
-            if (actionInput) {
-                $scope.content.actionInput = actionInput;
-            }
-
-            $scope.content.confirm = false;
-
-            success = function () {
-                Notification.setSuccessMessage(successMessage($scope.content.action));
-            };
-
-            error = function (response) {
-                angular.forEach(response.data.errors, function (responseError) {
-                    Notification.setErrorMessage(responseError);
-                });
-            };
-
-            params = installParams();
-            if ($scope.content.action === "install") {
-                HostBulkAction.installContent(params, success, error);
-            } else if ($scope.content.action === "update") {
-                HostBulkAction.updateContent(params, success, error);
-            } else if ($scope.content.action === "remove") {
-                HostBulkAction.removeContent(params, success, error);
-            } else if ($scope.content.action === "update all") {
-                HostBulkAction.updateContent(params, success, error);
-            }
+            $scope.performViaRemoteExecution();
         };
 
         $scope.performViaRemoteExecution = function(action, customize) {

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

@@ -27,11 +27,10 @@
       </div>
     </div>
 
-    <div ng-show="katelloAgentPresent" data-extend-template="common/views/katello-agent-notice.html"></div>
     <div bst-feature-flag="remote_actions">
       <p bst-alert="warning" ng-hide="hostToolingEnabled">
         <span translate>
-          Performing host package actions is disabled because Katello is not configured for Remote Execution or Katello Agent.
+          Performing host package actions is disabled because Katello is not configured for Remote Execution.
           </span>
       </p>
     </div>
@@ -58,7 +57,6 @@
           </button>
 
           <ul uib-dropdown-menu class="dropdown-menu-right" role="menu" aria-labelledby="use-remote-execution">
-            <li ng-show="katelloAgentPresent" role="presentation"><a ng-click="installErrataViaKatelloAgent()" role="menuitem" translate>via Katello agent</a></li>
             <li role="presentation"><a ng-click="installErrataViaRemoteExecution(false)" role="menuitem" translate>via remote execution</a></li>
             <li role="presentation"><a ng-click="installErrataViaRemoteExecution(true)" role="menuitem" translate>via remote execution - customize first</a></li>
           </ul>

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

@@ -8,11 +8,10 @@
       </div>
     </div>
 
-    <div ng-show="katelloAgentPresent" data-extend-template="common/views/katello-agent-notice.html"></div>
     <div bst-feature-flag="remote_actions">
       <p bst-alert="warning" ng-hide="hostToolingEnabled">
         <span translate>
-          Performing host package actions is disabled because Katello is not configured for Remote Execution or Katello Agent.
+          Performing host package actions is disabled because Katello is not configured for Remote Execution.
           </span>
       </p>
       <p bst-alert="warning">
@@ -38,7 +37,6 @@
         <span class="caret"></span>
       </button>
       <ul uib-dropdown-menu role="menu" aria-labelledby="install-use-remote-execution">
-        <li ng-show="katelloAgentPresent" role="presentation"><a ng-click="performViaKatelloAgent('update all', content)" role="menuitem" tabindex="-1" href="#" translate>via Katello Agent</a></li>
         <li role="presentation"><a ng-click="performViaRemoteExecution('update all', false)" role="menuitem" tabindex="-1" href="#" translate>via remote execution</a></li>
         <li role="presentation"><a ng-click="performViaRemoteExecution('update all', true)" role="menuitem" tabindex="-1" href="#" translate>via remote execution - customize first</a></li>
       </ul>
@@ -99,7 +97,6 @@
           <span class="caret"></span>
         </button>
         <ul uib-dropdown-menu role="menu" aria-labelledby="install-use-remote-execution">
-          <li ng-show="katelloAgentPresent" role="presentation"><a ng-click="performViaKatelloAgent('install', content)" role="menuitem" tabindex="-1" href="#" translate>via Katello Agent</a></li>
           <li role="presentation"><a ng-click="performViaRemoteExecution('install', false)" role="menuitem" tabindex="-1" href="#" translate>via remote execution</a></li>
           <li role="presentation"><a ng-click="performViaRemoteExecution('install', true)" role="menuitem" tabindex="-1" href="#" translate>via remote execution - customize first</a></li>
         </ul>
@@ -121,7 +118,6 @@
           <span class="caret"></span>
         </button>
         <ul uib-dropdown-menu role="menu" aria-labelledby="update-use-remote-execution">
-          <li ng-show="katelloAgentPresent" role="presentation"><a ng-click="performViaKatelloAgent('update', content)" role="menuitem" tabindex="-1" href="#" translate>via Katello Agent</a></li>
           <li role="presentation"><a ng-click="performViaRemoteExecution('update', false)" role="menuitem" tabindex="-1" href="#" translate>via remote execution</a></li>
           <li role="presentation"><a ng-click="performViaRemoteExecution('update', true)" role="menuitem" tabindex="-1" href="#" translate>via remote execution - customize first</a></li>
         </ul>
@@ -142,7 +138,6 @@
           <span class="caret"></span>
         </button>
         <ul uib-dropdown-menu role="menu" aria-labelledby="remove-use-remote-execution">
-          <li ng-show="katelloAgentPresent" role="presentation"><a ng-click="performViaKatelloAgent('remove', content)" role="menuitem" tabindex="-1" href="#" translate>via Katello Agent</a></li>
           <li role="presentation"><a ng-click="performViaRemoteExecution('remove', false)" role="menuitem" tabindex="-1" href="#" translate>via remote execution</a></li>
           <li role="presentation"><a ng-click="performViaRemoteExecution('remove', true)" role="menuitem" tabindex="-1" href="#" translate>via remote execution - customize first</a></li>
         </ul>

data/engines/bastion_katello/app/assets/javascripts/bastion_katello/content-hosts/content/content-host-debs-applicable.controller.js

@@ -30,7 +30,7 @@ angular.module('Bastion.content-hosts').controller('ContentHostDebsApplicableCon
             return $scope.getSelectedDebs().join(' ');
         };
 
-        $scope.performDefaultUpdateAction = function () {
+        $scope.performRexUpdate = function () {
             $scope.performViaRemoteExecution('packageUpdate', $scope.getRemoteExecutionCommand(), false);
         };
 

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

@@ -42,8 +42,6 @@ angular.module('Bastion.content-hosts').controller('ContentHostErrataController'
         };
 
         $scope.remoteExecutionPresent = BastionConfig.remoteExecutionPresent;
-        $scope.remoteExecutionByDefault = BastionConfig.remoteExecutionByDefault;
-        $scope.katelloAgentPresent = BastionConfig.katelloAgentPresent;
         $scope.hostToolingEnabled = BastionConfig.hostToolingEnabled;
         $scope.errataActionFormValues = {
             authenticityToken: $window.AUTH_TOKEN.replace(/"/g, '')
@@ -124,15 +122,6 @@ angular.module('Bastion.content-hosts').controller('ContentHostErrataController'
             return $scope.nutupane.getAllSelectedResults('errata_id');
         };
 
-        $scope.performViaKatelloAgent = function () {
-            var errataIds = $scope.selectedErrataIds();
-            HostErratum.apply({id: $scope.host.id, 'bulk_errata_ids': angular.toJson(errataIds)},
-                               function (task) {
-                                    $scope.table.selectAll(false);
-                                    $scope.transitionTo('content-host.tasks.details', {taskId: task.id});
-                                });
-        };
-
         $scope.performViaRemoteExecution = function(customize) {
             var errataIds = $scope.selectedErrataIds();
 
@@ -148,11 +137,7 @@ angular.module('Bastion.content-hosts').controller('ContentHostErrataController'
         };
 
         $scope.applySelected = function () {
-            if ($scope.remoteExecutionByDefault) {
-                $scope.performViaRemoteExecution(false);
-            } else {
-                $scope.performViaKatelloAgent();
-            }
+            $scope.performViaRemoteExecution(false);
         };
 
         $scope.nutupane.enableSelectAllResults();

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

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

data/engines/bastion_katello/app/assets/javascripts/bastion_katello/content-hosts/content/content-host-packages-actions.controller.js

@@ -12,7 +12,6 @@
 angular.module('Bastion.content-hosts').controller('ContentHostPackagesActionsController',
     ['$scope', '$location', 'BastionConfig', function ($scope, $location, BastionConfig) {
         var packageName = $location.search().package_name;
-        $scope.katelloAgentPresent = BastionConfig.katelloAgentPresent;
         $scope.remoteExecutionPresent = BastionConfig.remoteExecutionPresent;
         $scope.hostToolingEnabled = BastionConfig.hostToolingEnabled;
 

data/engines/bastion_katello/app/assets/javascripts/bastion_katello/content-hosts/content/content-host-packages-applicable.controller.js

@@ -19,7 +19,6 @@ angular.module('Bastion.content-hosts').controller('ContentHostPackagesApplicabl
     function ($scope, $timeout, $window, Package, HostPackage, translate, Nutupane, BastionConfig) {
         var packagesNutupane, openEventInfo;
 
-        $scope.katelloAgentPresent = BastionConfig.katelloAgentPresent;
         $scope.remoteExecutionPresent = BastionConfig.remoteExecutionPresent;
         $scope.hostToolingEnabled = BastionConfig.hostToolingEnabled;
 
@@ -35,16 +34,8 @@ angular.module('Bastion.content-hosts').controller('ContentHostPackagesApplicabl
             return $scope.getSelectedPackages().join(' ');
         };
 
-        $scope.getKatelloAgentCommand = function () {
-            return $scope.getSelectedPackages().join(',');
-        };
-
-        $scope.performDefaultUpdateAction = function () {
-            if ($scope.remoteExecutionByDefault) {
-                $scope.performViaRemoteExecution('packageUpdate', $scope.getRemoteExecutionCommand(), false);
-            } else {
-                $scope.performViaKatelloAgent('packageUpdate', $scope.getKatelloAgentCommand());
-            }
+        $scope.performRexUpdate = function () {
+            $scope.performViaRemoteExecution('packageUpdate', $scope.getRemoteExecutionCommand(), false);
         };
 
         packagesNutupane = new Nutupane(Package, {'host_id': $scope.$stateParams.hostId, 'packages_restrict_upgradable': true});

data/engines/bastion_katello/app/assets/javascripts/bastion_katello/content-hosts/content/content-host-packages-installed.controller.js

@@ -18,8 +18,6 @@ angular.module('Bastion.content-hosts').controller('ContentHostPackagesInstalled
     function ($scope, $timeout, $window, HostPackage, translate, Nutupane, BastionConfig) {
         var packagesNutupane;
         $scope.controllerName = 'katello_host_installed_packages';
-
-        $scope.katelloAgentPresent = BastionConfig.katelloAgentPresent;
         $scope.remoteExecutionPresent = BastionConfig.remoteExecutionPresent;
         $scope.hostToolingEnabled = BastionConfig.hostToolingEnabled;
 

data/engines/bastion_katello/app/assets/javascripts/bastion_katello/content-hosts/content/content-host-packages.controller.js

@@ -16,8 +16,6 @@
 angular.module('Bastion.content-hosts').controller('ContentHostPackagesController',
     ['$scope', '$timeout', '$window', 'HostPackage', 'translate', 'Nutupane', 'BastionConfig', 'Notification',
     function ($scope, $timeout, $window, HostPackage, translate, Nutupane, BastionConfig, Notification) {
-        var packageActions;
-
         $scope.openEventInfo = function (event) {
             // when the event has label defined, it means it comes
             // from foreman-tasks
@@ -38,7 +36,6 @@ angular.module('Bastion.content-hosts').controller('ContentHostPackagesControlle
 
         $scope.working = false;
         $scope.remoteExecutionPresent = BastionConfig.remoteExecutionPresent;
-        $scope.remoteExecutionByDefault = BastionConfig.remoteExecutionByDefault;
         $scope.packageActionFormValues = {
             authenticityToken: $window.AUTH_TOKEN.replace(/"/g, '')
         };
@@ -49,22 +46,7 @@ angular.module('Bastion.content-hosts').controller('ContentHostPackagesControlle
         };
 
         $scope.performPackageAction = function (actionType, term) {
-            if ($scope.remoteExecutionByDefault) {
-                $scope.performViaRemoteExecution(actionType, term, false);
-            } else {
-                $scope.performViaKatelloAgent(actionType, term);
-            }
-        };
-
-        $scope.performViaKatelloAgent = function (actionType, term) {
-            var terms = [];
-            if (term === '') {
-                packageActions.updateAll();
-            } else {
-                terms = term.split(/ *, */);
-                packageActions[actionType](terms);
-            }
-            $scope.working = true;
+            $scope.performViaRemoteExecution(actionType, term, false);
         };
 
         $scope.performViaRemoteExecution = function(actionType, term, customize) {
@@ -80,25 +62,5 @@ angular.module('Bastion.content-hosts').controller('ContentHostPackagesControlle
             }, 0);
         };
 
-        packageActions = {
-            updateAll: function () {
-                HostPackage.updateAll({id: $scope.host.id}, $scope.openEventInfo, $scope.errorHandler);
-            },
-            packageInstall: function (termList) {
-                HostPackage.install({id: $scope.host.id, packages: termList}, $scope.openEventInfo, $scope.errorHandler);
-            },
-            packageUpdate: function (termList) {
-                HostPackage.update({id: $scope.host.id, packages: termList}, $scope.openEventInfo, $scope.errorHandler);
-            },
-            packageRemove: function (termList) {
-                HostPackage.remove({id: $scope.host.id, packages: termList}, $scope.openEventInfo, $scope.errorHandler);
-            },
-            groupInstall: function (termList) {
-                HostPackage.install({id: $scope.host.id, groups: termList}, $scope.openEventInfo, $scope.errorHandler);
-            },
-            groupRemove: function (termList) {
-                HostPackage.remove({id: $scope.host.id, groups: termList}, $scope.openEventInfo, $scope.errorHandler);
-            }
-        };
     }
 ]);

data/engines/bastion_katello/app/assets/javascripts/bastion_katello/content-hosts/content/views/content-host-debs-applicable.html

@@ -14,11 +14,11 @@
 
   <div data-block="list-actions" bst-feature-flag="remote_actions">
     <div ng-hide="denied('edit_hosts', host)" class="nutupane-actions fr">
-      <form ng-submit="performDefaultUpdateAction()" role="form">
+      <form ng-submit="performRexUpdate()" role="form">
 
         <span uib-dropdown class="btn-group">
           <button class="btn btn-primary" type="button"
-                  ng-click="performDefaultUpdateAction()"
+                  ng-click="performRexUpdate()"
                   ng-hide="denied('edit_hosts', host)"
                   ng-disabled="working || table.numSelected === 0"
                   translate>

data/engines/bastion_katello/app/assets/javascripts/bastion_katello/content-hosts/content/views/content-host-errata.html

@@ -5,8 +5,6 @@
   <h3 translate ng-show="selectedErrataOption === 'current'">Installable Errata</h3>
 </div>
 
-<div ng-show="katelloAgentPresent" data-extend-template="common/views/katello-agent-notice.html"></div>
-
 <div ng-hide="host.hasContent()">
   <div data-extend-template="common/views/registration.html"></div>
 </div>
@@ -26,7 +24,7 @@
   <div bst-feature-flag="remote_actions">
     <p bst-alert="warning" ng-hide="hostToolingEnabled">
       <span translate>
-        Performing host package actions is disabled because Katello is not configured for Remote Execution or Katello Agent.
+        Performing host package actions is disabled because Katello is not configured for remote execution.
         </span>
     </p>
   </div>
@@ -80,7 +78,6 @@
               <span class="caret"></span>
             </button>
             <ul uib-dropdown-menu role="menu" aria-labelledby="use-remote-execution">
-              <li ng-show="katelloAgentPresent" role="presentation"><a ng-click="performViaKatelloAgent()" role="menuitem" tabindex="-1" href="#" translate>via Katello agent</a></li>
               <li role="presentation"><a ng-click="performViaRemoteExecution(false)" role="menuitem" tabindex="-1" href="#" translate>via remote execution</a></li>
               <li role="presentation"><a ng-click="performViaRemoteExecution(true)" role="menuitem" tabindex="-1" href="#" translate>via remote execution - customize first</a></li>
             </ul>

data/engines/bastion_katello/app/assets/javascripts/bastion_katello/content-hosts/content/views/content-host-packages-actions.html

@@ -2,10 +2,9 @@
 
 <section ng-hide="denied('edit_hosts', host)" bst-feature-flag="remote_actions">
   <h4 translate>Package Actions</h4>
-  <div ng-show="katelloAgentPresent" data-extend-template="common/views/katello-agent-notice.html"></div>
   <p bst-alert="warning" ng-hide="hostToolingEnabled">
     <span translate>
-      Performing host package actions is disabled because Katello is not configured for Remote Execution or Katello Agent.
+      Performing host package actions is disabled because Katello is not configured for remote execution.
       </span>
   </p>
   <p bst-alert="warning">
@@ -49,7 +48,6 @@
                 <span class="caret"></span>
               </button>
               <ul uib-dropdown-menu role="menu" aria-labelledby="use-remote-execution">
-                <li ng-show="katelloAgentPresent" role="presentation"><a ng-click="performViaKatelloAgent(packageAction.actionType, packageAction.term)" role="menuitem" tabindex="-1" href="#" translate>via Katello agent</a></li>
                 <li role="presentation"><a ng-click="performViaRemoteExecution(packageAction.actionType, packageAction.term, false)" role="menuitem" tabindex="-1" href="#" translate>via remote execution</a></li>
                 <li role="presentation"><a ng-click="performViaRemoteExecution(packageAction.actionType, packageAction.term, true)" role="menuitem" tabindex="-1" href="#" translate>via remote execution - customize first</a></li>
               </ul>
@@ -60,7 +58,7 @@
         <div class="form-group">
           <button class="btn btn-default" type="button"
                   translate
-                  ng-disabled="working || (!remoteExecutionPresent && !katelloAgentPresent)"
+                  ng-disabled="working || !remoteExecutionPresent"
                   ng-click="updateAll()">
             Update All Packages
           </button>

data/engines/bastion_katello/app/assets/javascripts/bastion_katello/content-hosts/content/views/content-host-packages-applicable.html

@@ -1,12 +1,11 @@
 <span page-title ng-model="host">{{ 'Packages for: ' | translate }} {{ host.name }}</span>
 
 <h3 translate>Applicable Packages</h3>
-<div ng-show="katelloAgentPresent" data-extend-template="common/views/katello-agent-notice.html"></div>
 
 <section ng-hide="denied('edit_hosts', host)" bst-feature-flag="remote_actions">
   <p bst-alert="warning" ng-hide="hostToolingEnabled">
     <span translate>
-      Performing host package actions is disabled because Katello is not configured for Remote Execution or Katello Agent.
+      Performing host package actions is disabled because Katello is not configured for remote execution.
       </span>
   </p>
 </section>
@@ -23,11 +22,11 @@
 
   <div data-block="list-actions" bst-feature-flag="remote_actions">
     <div ng-hide="denied('edit_hosts', host)" class="nutupane-actions fr">
-      <form ng-submit="performDefaultUpdateAction()" role="form">
+      <form ng-submit="performRexUpdate()" role="form">
 
         <span uib-dropdown class="btn-group">
           <button class="btn btn-primary" type="button"
-                  ng-click="performDefaultUpdateAction()"
+                  ng-click="performRexUpdate()"
                   ng-hide="denied('edit_hosts', host)"
                   ng-disabled="working || table.numSelected === 0 || !hostToolingEnabled"
                   translate>
@@ -40,7 +39,6 @@
             <span class="caret"></span>
           </button>
           <ul uib-dropdown-menu role="menu" aria-labelledby="use-remote-execution">
-            <li ng-show="katelloAgentPresent" role="presentation"><a ng-click="performViaKatelloAgent('packageUpdate', getKatelloAgentCommand())" role="menuitem" tabindex="-1" href="#" translate>via Katello agent</a></li>
             <li role="presentation"><a ng-click="performViaRemoteExecution('packageUpdate', getRemoteExecutionCommand(), false)" role="menuitem" tabindex="-1" href="#" translate>via remote execution</a></li>
             <li role="presentation"><a ng-click="performViaRemoteExecution('packageUpdate', getRemoteExecutionCommand(), true)" role="menuitem" tabindex="-1" href="#" translate>via remote execution - customize first</a></li>
           </ul>
@@ -49,7 +47,7 @@
         <button class="btn btn-default"
                 type="button"
                 translate
-                ng-disabled="working || (!remoteExecutionPresent && !katelloAgentPresent)"
+                ng-disabled="working || !remoteExecutionPresent"
                 ng-click="updateAll()">
           Update All Packages
         </button>

data/engines/bastion_katello/app/assets/javascripts/bastion_katello/content-hosts/content/views/content-host-packages-installed.html

@@ -2,12 +2,10 @@
 
 <h3 translate>Installed Packages</h3>
 
-<div ng-show="katelloAgentPresent" data-extend-template="common/views/katello-agent-notice.html"></div>
-
 <section ng-hide="denied('edit_hosts', host)" bst-feature-flag="remote_actions">
   <p bst-alert="warning" ng-hide="hostToolingEnabled">
     <span translate>
-      Performing host package actions is disabled because Katello is not configured for Remote Execution or Katello Agent.
+      Performing host package actions is disabled because Katello is not configured for remote execution.
       </span>
   </p>
 </section>

data/engines/bastion_katello/app/assets/javascripts/bastion_katello/content-hosts/details/views/content-host-info.html

@@ -51,20 +51,6 @@
           </button>
         </dd>
 
-        <dt bst-feature-flag="remote_actions" ng-show="katelloAgentPresent">
-          <span translate>Katello Agent</span>
-        </dt>
-        <dd bst-feature-flag="remote_actions" ng-show="katelloAgentPresent">
-          <span ng-show="host.content_facet_attributes.katello_agent_installed">
-            <span class="{{ getHostStatusIcon(0) }}"></span>
-            <span translate>Installed</span>
-          </span>
-          <span ng-hide="host.content_facet_attributes.katello_agent_installed">
-            <span class="{{ getHostStatusIcon(1) }}"></span>
-            <span translate>Not installed</span>
-          </span>
-        </dd>
-
         <dt ng-show="host.subscription_facet_attributes.virtual_guests" translate>Virtual Guests</dt>
         <dd ng-show="host.subscription_facet_attributes.virtual_guests">
           <a ng-href="/content_hosts?search={{virtualGuestIds(host)}}"

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

@@ -43,7 +43,6 @@ 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(','),
@@ -144,7 +143,7 @@ angular.module('Bastion.errata').controller('ApplyErrataController',
             $scope.confirmApply = function() {
                 $scope.applyingErrata = true;
                 if ($scope.updates.length === 0) {
-                    if ($scope.remoteExecutionPresent && $scope.remoteExecutionByDefault) {
+                    if ($scope.remoteExecutionPresent) {
                         angular.element('#errataActionForm').submit();
                     } else {
                         applyErrata();

data/engines/bastion_katello/app/assets/javascripts/bastion_katello/files/details/file-content-views.controller.js

@@ -11,7 +11,8 @@
         var contentViewsNutupane,
             params = {
                 'file_id': $scope.$stateParams.fileId,
-                'organization_id': CurrentOrganization
+                'organization_id': CurrentOrganization,
+                'nondefault': true
             };
 
         contentViewsNutupane = new Nutupane(ContentViewVersion, params);

data/engines/bastion_katello/app/assets/javascripts/bastion_katello/files/details/views/file-content-views.html

@@ -24,7 +24,7 @@
       <tbody>
         <tr bst-table-row ng-repeat="version in table.rows">
           <td bst-table-cell>
-            <a ui-sref="content-view.info({contentViewId: version.content_view.id})">
+            <a href="/content_views/{{version.content_view.id}}">
               {{ version.content_view.name }}
             </a>
           </td>