katello 4.11.1 → 4.12.0.rc1

data/app/views/overrides/organizations/_edit_override.html.erb

@@ -11,16 +11,4 @@
                :type => :button, :style => 'margin-top: 8px;', :class => 'btn btn-small',
                'data-url' => "/katello/api/v2/organizations/#{@taxonomy.id}/download_debug_certificate"
   end %>
-
-  <%= field(f, _('Simple Content Access')) do
-    tag1 = hidden_field_tag 'simple_content_access', '0'
-    tag2 = check_box_tag 'simple_content_access', '1', @taxonomy.simple_content_access?(cached: false)
-    tag1 + tag2
-  end %>
-
-  <div class="alert alert-warning" role="alert">
-    <%= link_to _('Simple Content Access'), 'https://access.redhat.com/articles/transition_of_subscription_services_to_the_hybrid_cloud_console', :rel => "external" %>
-    <%= _(' will be required for all organizations in Katello 4.12.') %>
-  </div>
-
 <% end %>

data/db/migrate/20131014225132_add_users_fields.rb

@@ -3,7 +3,6 @@ class AddUsersFields < ActiveRecord::Migration[4.2]
     add_column :users, :helptips_enabled, :boolean, :default => true
     add_column :users, :hidden, :boolean, :default => false, :null => false
     add_column :users, :page_size, :integer, :default => 25, :null => false
-    add_column :users, :disabled, :boolean, :default => false
     add_column :users, :preferences, :text
     add_column :users, :remote_id, :string, :limit => 255
   end

data/db/migrate/20150603045418_remove_user_fields.rb

@@ -2,7 +2,6 @@ class RemoveUserFields < ActiveRecord::Migration[4.2]
   def up
     remove_column :users, :helptips_enabled
     remove_column :users, :page_size
-    remove_column :users, :disabled
     remove_column :users, :preferences
     remove_column :users, :remote_id
   end
@@ -11,7 +10,6 @@ class RemoveUserFields < ActiveRecord::Migration[4.2]
     add_column :users, :helptips_enabled, :boolean, :default => true
     add_column :users, :hidden, :boolean, :default => false, :null => false
     add_column :users, :page_size, :integer, :default => 25, :null => false
-    add_column :users, :disabled, :boolean, :default => false
     add_column :users, :preferences, :text
     add_column :users, :remote_id, :string, :limit => 255
   end

data/db/migrate/20160404132250_remove_katello_from_notification_name.rb

@@ -1,26 +1,8 @@
 class RemoveKatelloFromNotificationName < ActiveRecord::Migration[4.2]
-  class FakeMailNotification < ApplicationRecord
-    self.table_name = 'mail_notifications'
-  end
-
   def up
-    FakeMailNotification.all.each do |notification|
-      if notification_names.keys.include?(notification.name)
-        new_name = notification_names[notification.name]
-        FakeMailNotification.where(:name => new_name).destroy_all
-        notification.name = new_name
-        notification.save!
-      end
-    end
-  end
-
-  private
-
-  def notification_names
-    {
-      :katello_promote_errata => 'promote_errata',
-      :katello_sync_errata => 'sync_errata',
-      :katello_host_advisory => 'host_errata_advisory'
-    }.with_indifferent_access
+    # historical placeholder
+    # only required on setups before https://projects.theforeman.org/issues/14459
+    # we can safely assume that fresh installs have the above change already
+    # and existing install had this migration applied back in 2016
   end
 end

data/db/migrate/20160505181337_rename_katello_settings.rb

@@ -1,9 +1,9 @@
 class RenameKatelloSettings < ActiveRecord::Migration[4.2]
   def up
-    Setting.where(category: 'Setting::Katello').update_all(:category => 'Setting::Content')
+    Setting.where(category: 'Setting::Katello').update_all(:category => 'Setting::Content') if column_exists?(:settings, :category)
   end
 
   def down
-    Setting.where(category: 'Setting::Content').update_all(:category => 'Setting::Katello')
+    Setting.where(category: 'Setting::Content').update_all(:category => 'Setting::Katello') if column_exists?(:settings, :category)
   end
 end

data/db/migrate/20200818192230_update_system_purpose_status.rb

@@ -1,12 +1,18 @@
 class UpdateSystemPurposeStatus < ActiveRecord::Migration[6.0]
   def change
-    purpose_types = Katello::HostStatusManager::PURPOSE_STATUS.map(&:to_s)
+    purpose_types = [
+      "Katello::PurposeStatus",
+      "Katello::PurposeAddonsStatus",
+      "Katello::PurposeRoleStatus",
+      "Katello::PurposeSlaStatus",
+      "Katello::PurposeUsageStatus"
+    ]
 
     # load both sets of host statuses and *then* update them to make sure we update the correct statuses
     unknown_statuses = ::HostStatus::Status.where(type: purpose_types, status: 2).pluck(:id)
     matched_statuses = ::HostStatus::Status.where(type: purpose_types, status: 0).pluck(:id)
 
-    ::HostStatus::Status.where(id: unknown_statuses).update_all(status: Katello::PurposeStatus::UNKNOWN) # 2 => 0
-    ::HostStatus::Status.where(id: matched_statuses).update_all(status: Katello::PurposeStatus::MATCHED) # 0 => 2
+    ::HostStatus::Status.where(id: unknown_statuses).update_all(status: 0) # 2 => 0
+    ::HostStatus::Status.where(id: matched_statuses).update_all(status: 2) # 0 => 2
   end
 end

data/db/migrate/20240111032511_add_index_to_host_installed_packages.rb

@@ -0,0 +1,16 @@
+class AddIndexToHostInstalledPackages < ActiveRecord::Migration[6.1]
+  def up
+    add_index :katello_host_installed_packages, [:installed_package_id],
+      :name => 'katello_host_installed_packages_ip_id'
+    add_index :katello_host_installed_packages, [:host_id],
+      :name => 'katello_host_installed_packages_host_id'
+  end
+
+  def down
+    remove_index :katello_host_installed_packages,
+      :name => 'katello_host_installed_packages_ip_id'
+
+    remove_index :katello_host_installed_packages,
+      :name => 'katello_host_installed_packages_host_id'
+  end
+end

data/db/migrate/20240123120109_remove_pulp_export_destination_setting.rb

@@ -0,0 +1,9 @@
+class RemovePulpExportDestinationSetting < ActiveRecord::Migration[6.1]
+  def up
+    Setting.where(name: 'pulp_export_destination').delete_all
+  end
+
+  def down
+    # no action, seeding on app start should create the object with the default value
+  end
+end

data/db/migrate/20240207191223_remove_entitlement_mode_host_statuses.rb

@@ -0,0 +1,30 @@
+class RemoveEntitlementModeHostStatuses < ActiveRecord::Migration[6.1]
+  class FakeTablePreference < ApplicationRecord
+    self.table_name = 'table_preferences'
+    serialize :columns
+  end
+
+  def up
+    obsolete_statuses = [
+      "Katello::SubscriptionStatus",
+      "Katello::PurposeStatus",
+      "Katello::PurposeAddonsStatus",
+      "Katello::PurposeRoleStatus",
+      "Katello::PurposeSlaStatus",
+      "Katello::PurposeUsageStatus"
+    ]
+
+    ::HostStatus::Status.where(type: obsolete_statuses).delete_all
+
+    FakeTablePreference.where(name: "hosts").each do |table_preference|
+      next unless table_preference.columns.include?("subscription_status")
+      new_columns = table_preference.columns - ["subscription_status"]
+      if new_columns.present?
+        table_preference.columns = new_columns
+        table_preference.save(validate: false)
+      else
+        table_preference.destroy
+      end
+    end
+  end
+end

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

@@ -9,6 +9,7 @@ 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.8:regenerate_imported_repository_metadata'},
+    {:name => 'katello:upgrades:4.12:update_content_access_modes'}
   ]
 end

data/engines/bastion/app/assets/javascripts/bastion/bastion.js

@@ -36,5 +36,3 @@
 
 //= require "bastion/features/features.module"
 //= require_tree "./features"
-
-//= require "bastion/bastion-bootstrap"

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

@@ -10,11 +10,13 @@
 <% end %>
 
 <% content_for(:javascripts) do %>
-  <%= javascript_include_tag 'bastion/bastion' %>
+
+  <%=  javascript_tag("window.tfm.tools.loadPluginModule('/webpack/katello','katello','./common_index');".html_safe) %>
+  <%= javascript_include_tag('bastion/bastion', {type: 'module'})%>
   <% if File.exist?("#{Bastion::Engine.root}/vendor/assets/javascripts/#{Bastion.localization_path(I18n.locale)}") %>
     <%= javascript_include_tag(Bastion.localization_path(I18n.locale)) %>
   <% end %>
-  <script type="text/javascript">
+  <script type="module">
     angular.module('Bastion.features').value('FeatureSettings', angular.fromJson(<%= SETTINGS[:features].nil? ? {} : SETTINGS[:features].to_json.html_safe %>));
     angular.module('Bastion').value('currentLocale', '<%= I18n.locale %>');
     angular.module('Bastion').value('CurrentOrganization', "<%= Organization.current.id if Organization.current %>");
@@ -34,6 +36,8 @@
     angular.module('Bastion').value('newHostDetailsUI', "<%= Setting[:host_details_ui] %>");
     angular.module('Bastion').value('experimentalLabsSetting', "<%= Setting[:lab_features] %>");
   </script>
+
+  <%= javascript_include_tag('bastion_katello/bastion_katello',  {type: 'module'}) %>
   <% Bastion.plugins.each do |name, plugin| %>
     <%= include_plugin_js(plugin) %>
   <% end %>

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

@@ -33,10 +33,6 @@
               <a ng-switch-when="false" ui-sref="content-host.info({hostId: host.id})">{{ host.name }}</a>
             </span>
           </td>
-          <td bst-table-cell ng-if="!simpleContentAccessEnabled">
-            <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.subscription_facet_attributes.service_level }}</td>

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

@@ -31,7 +31,6 @@
   </div>
 
   <nav data-block="navigation">
-    <div content-access-mode-banner></div>
     <ul class="nav nav-tabs details-nav">
       <li ng-class="{active: isState('activation-key.info')}">
         <a ui-sref="activation-key.info">

data/engines/bastion_katello/app/assets/javascripts/bastion_katello/bastion-katello-bootstrap.js

@@ -1,29 +1,45 @@
-BASTION_MODULES.push(
-    'Bastion.capsule-content',
-    'Bastion.pulp-primary',
-    'Bastion.activation-keys',
-    'Bastion.architectures' ,
-    'Bastion.common',
-    'Bastion.content-views',
-    'Bastion.content-views.versions',
-    'Bastion.debs',
-    'Bastion.docker-tags',
-    'Bastion.files',
-    'Bastion.ansible-collections',
-    'Bastion.hosts',
-    'Bastion.module-streams',
-    'Bastion.environments',
-    'Bastion.content-credentials',
-    'Bastion.hosts',
-    'Bastion.capsules',
-    'Bastion.organizations',
-    'Bastion.products',
-    'Bastion.repositories',
-    'Bastion.subscriptions',
-    'Bastion.sync-plans',
-    'Bastion.http-proxies',
-    'Bastion.host-collections',
-    'Bastion.content-hosts',
-    'Bastion.tasks',
-    'Bastion.settings'
-);
+var BASTION_MODULES = [
+  'angular-blocks',
+  'ngAnimate',
+  'ngSanitize',
+  'templates',
+  'ui.bootstrap',
+  'ui.bootstrap.tpls',
+  'Bastion.auth',
+  'Bastion.menu',
+  'Bastion.i18n',
+  'Bastion.features',
+  'Bastion.routing',
+  'Bastion.capsule-content',
+  'Bastion.pulp-primary',
+  'Bastion.activation-keys',
+  'Bastion.architectures',
+  'Bastion.common',
+  'Bastion.content-views',
+  'Bastion.content-views.versions',
+  'Bastion.debs',
+  'Bastion.docker-tags',
+  'Bastion.files',
+  'Bastion.ansible-collections',
+  'Bastion.hosts',
+  'Bastion.module-streams',
+  'Bastion.environments',
+  'Bastion.content-credentials',
+  'Bastion.hosts',
+  'Bastion.capsules',
+  'Bastion.organizations',
+  'Bastion.products',
+  'Bastion.repositories',
+  'Bastion.subscriptions',
+  'Bastion.sync-plans',
+  'Bastion.http-proxies',
+  'Bastion.host-collections',
+  'Bastion.content-hosts',
+  'Bastion.tasks',
+  'Bastion.settings'
+];
+
+// Check if the document has already been bootstrapped.
+if (!angular.element(document).injector()) {
+    angular.bootstrap(document, BASTION_MODULES);
+}

data/engines/bastion_katello/app/assets/javascripts/bastion_katello/content-hosts/content-hosts-helper.service.js

@@ -38,16 +38,6 @@ angular.module('Bastion.content-hosts').service('ContentHostsHelper',
             return icons[globalStatus];
         };
 
-        this.getHostPurposeStatusIcon = function (statusCode) {
-            var code = parseInt(statusCode);
-
-            if (code === 2) { // matched
-                return 'pficon pficon-ok';
-            } else if (code === 1) { // mismatched
-                return 'pficon pficon-warning-triangle-o';
-            }
-        };
-
         this.rebootRequired = function(traces) {
             return traces.some(function(trace) {
                 return trace.reboot_required;

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

@@ -24,7 +24,6 @@ angular.module('Bastion.content-hosts').controller('ContentHostDetailsController
         $scope.menuExpander = MenuExpander;
 
         $scope.getHostStatusIcon = ContentHostsHelper.getHostStatusIcon;
-        $scope.getHostPurposeStatusIcon = ContentHostsHelper.getHostPurposeStatusIcon;
 
         $scope.organization = Organization.get({id: CurrentOrganization}, function(org) {
             $scope.purposeAddonsCount += org.system_purposes.addons.length;

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

@@ -51,8 +51,8 @@
           </button>
         </dd>
 
-        <dt ng-show="host.subscription_facet_attributes.virtual_guests" translate>Virtual Guests</dt>
-        <dd ng-show="host.subscription_facet_attributes.virtual_guests">
+        <dt ng-show="host.subscription_facet_attributes.virtual_guests.length" translate>Virtual Guests</dt>
+        <dd ng-show="host.subscription_facet_attributes.virtual_guests.length">
           <a ng-href="/content_hosts?search={{virtualGuestIds(host)}}"
              translate translate-n="host.subscription_facet_attributes.virtual_guests.length"
              translate-plural="{{ host.subscription_facet_attributes.virtual_guests.length }} Content Hosts">
@@ -74,12 +74,6 @@
       <h4 translate>Subscriptions</h4>
 
       <dl class="dl-horizontal dl-horizontal-left">
-        <dt translate>Subscription Status</dt>
-        <dd>
-          <i ng-class="getHostStatusIcon(host.subscription_global_status)"></i>
-          {{ host.subscription_status_label }}
-        </dd>
-
         <dt translate ng-if="!simpleContentAccessEnabled">Details</dt>
         <dd ng-if="!simpleContentAccessEnabled">
           <ul class="compliance-reasons">
@@ -104,16 +98,9 @@
       <div style="display: inline-block"><i class="pficon-info" title="{{ 'System purpose enables you to set the system\'s intended use on your network and improves reporting accuracy in the Subscriptions service of the Red Hat Hybrid Cloud Console.' | translate }}"></i></div>
 
       <dl class="dl-horizontal dl-horizontal-left">
-        <dt translate ng-hide="simpleContentAccessEnabled">System Purpose Status</dt>
-        <dd ng-hide="simpleContentAccessEnabled">
-          <i ng-class="getHostPurposeStatusIcon(host.purpose_status)"></i>
-          {{ host.purpose_status_label }}
-        </dd>
         <dt translate>Service Level (SLA)</dt>
         <dd bst-edit-select="host.subscription_facet_attributes.service_level"
             readonly="denied('edit_hosts', host)"
-            icon-class="getHostPurposeStatusIcon(host.purpose_sla_status)"
-            icon-show="host.purpose_sla_status > 0"
             selector="host.subscription_facet_attributes.service_level"
             options="serviceLevels()"
             options-format="option for option in options"
@@ -125,8 +112,6 @@
         <dt translate>Usage Type</dt>
         <dd bst-edit-select="host.subscription_facet_attributes.purpose_usage"
             readonly="denied('edit_hosts', host)"
-            icon-class="getHostPurposeStatusIcon(host.purpose_usage_status)"
-            icon-show="host.purpose_usage_status > 0"
             selector="host.subscription_facet_attributes.purpose_usage"
             options="purposeUsages()"
             options-format="option for option in options"
@@ -138,8 +123,6 @@
         <dt translate>Role</dt>
         <dd bst-edit-select="host.subscription_facet_attributes.purpose_role"
             readonly="denied('edit_hosts', host)"
-            icon-class="getHostPurposeStatusIcon(host.purpose_role_status)"
-            icon-show="host.purpose_role_status > 0"
             selector="host.subscription_facet_attributes.purpose_role"
             options="purposeRoles()"
             options-format="option for option in options"
@@ -151,8 +134,6 @@
         <dt translate>Add ons</dt>
         <dd bst-edit-multiselect="host.subscription_facet_attributes.purpose_addons"
             readonly="denied('edit_hosts', host) || purposeAddonsCount === 0"
-            icon-class="getHostPurposeStatusIcon(host.purpose_addons_status)"
-            icon-show="host.purpose_addons_status > 0"
             formatter="arrayToString"
             deletable="true"
             on-delete="clearAddOns()"

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

@@ -10,11 +10,6 @@
       <h4 translate>Subscription Details</h4>
 
       <dl class="dl-horizontal dl-horizontal-left">
-        <dt translate>Status</dt>
-        <dd>
-          <i ng-class="getHostStatusIcon(host.subscription_global_status)"></i>
-          {{ host.subscription_status_label | translate }}
-        </dd>
 
         <dt ng-show="host.subscription_facet_attributes.compliance_reasons.length > 0" translate>Details</dt>
         <dd ng-show="host.subscription_facet_attributes.compliance_reasons.length > 0">

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

@@ -79,9 +79,6 @@
       <thead>
         <tr bst-table-head row-select>
           <th bst-table-column="name" sortable><span translate>Name</span></th>
-          <th bst-table-column="subscription_status" ng-hide="simpleContentAccessEnabled" sortable>
-            {{ 'Subscription Status' | translate }}
-          </th>
           <th bst-table-column="status">
             <span translate>Installable Updates</span>
           </th>
@@ -105,10 +102,6 @@
               <a ng-switch-when="false" ui-sref="content-host.info({hostId: host.id})">{{ host.display_name }}</a>
             </span>
           </td>
-          <td bst-table-cell ng-hide="simpleContentAccessEnabled">
-            <span ng-class="table.getHostStatusIcon(host.subscription_global_status)">
-            </span>
-          </td>
           <td>
             <a ui-sref="content-host.errata.index({hostId: host.id})">
               <span class="aligned-errata-count" errata-counts="host.content_facet_attributes.errata_counts"></span>

data/engines/bastion_katello/app/assets/javascripts/bastion_katello/i18n/bastion_katello.pot

@@ -2100,6 +2100,10 @@ msgstr ""
 msgid "Id"
 msgstr ""
 
+#: app/assets/javascripts/bastion_katello/products/details/repositories/details/views/repository-info.html
+msgid "If you want to upload individual packages, create a separate repository with an empty \"Upstream URL\" field."
+msgstr ""
+
 #: app/assets/javascripts/bastion_katello/products/details/repositories/details/views/repository-info.html
 #: app/assets/javascripts/bastion_katello/products/details/repositories/new/views/new-repository.html
 msgid "Ignore SRPMs"
@@ -4000,10 +4004,6 @@ msgstr ""
 msgid "Subscription UUID"
 msgstr ""
 
-#: app/assets/javascripts/bastion_katello/activation-keys/details/views/activation-key-info.html
-msgid "subscription-manager register --org=\"{{ activationKey.organization.label }}\" --activationkey=\"{{ activationKey.name }}\""
-msgstr ""
-
 #: app/assets/javascripts/bastion_katello/activation-keys/details/views/activation-key-details.html
 #: app/assets/javascripts/bastion_katello/content-hosts/details/views/content-host-details.html
 #: app/assets/javascripts/bastion_katello/content-hosts/details/views/content-host-info.html
@@ -4377,7 +4377,7 @@ msgid "This activation key is not associated with any content hosts."
 msgstr ""
 
 #: app/assets/javascripts/bastion_katello/activation-keys/details/views/activation-key-info.html
-msgid "This activation key may be used during system registration. For example:"
+msgid "This activation key may be used during <a href=\"/hosts/register?initialAKSelection={{ activationKey.name }}\">system registration.</a>"
 msgstr ""
 
 #: app/assets/javascripts/bastion_katello/content-hosts/bulk/views/content-hosts-bulk-system-purpose-modal.html

data/engines/bastion_katello/app/assets/javascripts/bastion_katello/products/details/repositories/details/views/repository-info.html

@@ -517,8 +517,9 @@
       <div class="divider" ng-if="repository.content_type === 'ostree'"/>
     </section>
 
+    <span ng-hide="(repository.content_type === 'deb' && repository.url)">
     <section class="well" ng-if="permitted('edit_products', product) && !product.redhat && repository.content_type !== 'docker' && repository.content_type !== 'ostree' && repository.content_type !== 'ansible_collection'">
-      <h5 translate ng-show="repository.content_type === 'yum'">Upload Package</h5>
+      <h5 translate ng-show="repository.content_type === 'yum' || 'deb'">Upload Package</h5>
       <h5 translate ng-show="repository.content_type === 'file'">Upload File</h5>
 
       <form role="form"
@@ -544,6 +545,13 @@
 
       </form>
     </section>
+    </span>
+    <span ng-show="(repository.content_type === 'deb' && repository.url)">
+      <section class="well">
+        <h5 translate>Upload Package</h5>
+        <div class="alert alert-info" role="alert" translate>If you want to upload individual packages, create a separate repository with an empty "Upstream URL" field.</div>
+      </section>
+    </span>
 
     <section ng-show="repository.content_type === 'yum'">
       <div class="divider"></div>

data/engines/bastion_katello/lib/bastion_katello/engine.rb

@@ -14,12 +14,6 @@ module BastionKatello
 
       Bastion.register_plugin(
         :name => 'bastion_katello',
-        :javascript => proc do
-          [
-            javascript_include_tag(*webpack_asset_paths('katello:common', :extension => 'js'), "data-turbolinks-track" => true),
-            javascript_include_tag('bastion_katello/bastion_katello')
-          ]
-        end,
         :stylesheet => 'bastion_katello/bastion_katello',
         :pages => %w(
           activation_keys

data/lib/katello/engine.rb

@@ -156,7 +156,6 @@ module Katello
 
       #Controller extensions
       ::HostsController.include Katello::Concerns::HostsControllerExtensions
-      ::HostsController.include Katello::Concerns::ContentFacetHostsControllerExtensions
       ::SmartProxiesController.include Katello::Concerns::SmartProxiesControllerExtensions
       ::RegistrationCommandsController.prepend Katello::Concerns::RegistrationCommandsControllerExtensions
 
@@ -194,7 +193,6 @@ module Katello
 
       #Api controller extensions
       ::Api::V2::HostsController.include Katello::Concerns::Api::V2::HostsControllerExtensions
-      ::Api::V2::HostsController.include Katello::Concerns::ContentFacetHostsControllerExtensions
       ::Api::V2::HostsBulkActionsController.include Katello::Concerns::Api::V2::HostsBulkActionsControllerExtensions
       ::Api::V2::HostgroupsController.include Katello::Concerns::Api::V2::HostgroupsControllerExtensions
       ::Api::V2::SmartProxiesController.include Katello::Concerns::Api::V2::SmartProxiesControllerExtensions
@@ -203,7 +201,6 @@ module Katello
       ::Api::V2::RegistrationCommandsController.include Katello::Concerns::Api::V2::RegistrationCommandsControllerExtensions
 
       ::AuditSearch::ClassMethods.prepend Katello::Concerns::AuditSearch
-      ::Widget.singleton_class.prepend Katello::Concerns::WidgetExtensions::ClassMethods
 
       if ::Katello.with_remote_execution?
         ::RemoteExecutionProxySelector.prepend Katello::Concerns::RemoteExecutionProxySelectorExtensions

data/lib/katello/plugin.rb

@@ -246,8 +246,6 @@ Foreman::Plugin.register :katello do
   widget 'errata_widget', :name => 'Latest Errata', :sizey => 1, :sizex => 6
   widget 'content_views_widget', :name => 'Content Views', :sizey => 1, :sizex => 6
   widget 'sync_widget', :name => 'Sync Overview', :sizey => 1, :sizex => 6
-  widget 'subscription_widget', :name => 'Host Subscription Status', :sizey => 1, :sizex => 6
-  widget 'subscription_status_widget', :name => 'Subscription Status', :sizey => 1, :sizex => 6
   widget 'host_collection_widget', :name => 'Host Collections', :sizey => 1, :sizex => 6
 
   extend_page("smart_proxies/show") do |context|
@@ -270,9 +268,6 @@ Foreman::Plugin.register :katello do
       common_class = 'hidden-tablet hidden-xs ellipsis'
       use_pagelet :hosts_table_column_header, :name
       use_pagelet :hosts_table_column_content, :name
-      add_pagelet :hosts_table_column_header, key: :subscription_status, label: _('Subscription status'), sortable: true, class: common_class, width: '10%', export_key: 'subscription_global_status'
-      add_pagelet :hosts_table_column_content, key: :subscription_status, class: common_class, callback: ->(host) { host_status_icon(host.subscription_global_status) }
-
       add_pagelet :hosts_table_column_header, key: :rhel_lifecycle_status, label: _('RHEL Lifecycle status'), sortable: true, class: common_class, width: '10%', export_key: 'rhel_lifecycle_status'
       add_pagelet :hosts_table_column_content, key: :rhel_lifecycle_status, class: common_class, callback: ->(host) { host_status_icon(host.rhel_lifecycle_global_status) }
 
@@ -303,6 +298,7 @@ Foreman::Plugin.register :katello do
 
   extend_rabl_template 'api/v2/smart_proxies/main', 'katello/api/v2/smart_proxies/pulp_info'
   extend_rabl_template 'api/v2/hosts/show', 'katello/api/v2/hosts/host_collections'
+  extend_rabl_template 'api/v2/hosts/show', 'katello/api/v2/hosts/show'
 
   # Katello variables for Host Registration
   extend_allowed_registration_vars :activation_keys
@@ -523,12 +519,6 @@ Foreman::Plugin.register :katello do
         description: N_("Default download policy for Smart Proxy syncs (either 'inherit', immediate', or 'on_demand')"),
         collection: proxy_download_policies
 
-      setting 'pulp_export_destination',
-        type: :string,
-        default: "/var/lib/pulp/katello-export",
-        full_name: N_('Pulp export destination filepath'),
-        description: N_("On-disk location for exported repositories")
-
       setting 'pulpcore_export_destination',
         type: :string,
         default: "/var/lib/pulp/exports",
@@ -685,6 +675,7 @@ Foreman::Plugin.register :katello do
     RemoteExecutionFeature.register(:katello_errata_install_by_search, N_("Katello: Install errata by search query"), :description => N_("Install errata using scoped search query"), :provided_inputs => ['Errata search query'])
     RemoteExecutionFeature.register(:katello_service_restart, N_("Katello: Service Restart"), :description => N_("Restart Services via Katello interface"), :provided_inputs => ['helpers'])
     RemoteExecutionFeature.register(:katello_host_tracer_resolve, N_("Katello: Resolve Traces"), :description => N_("Resolve traces via Katello interface"), :provided_inputs => ['ids'])
+    RemoteExecutionFeature.register(:katello_change_content_source, N_("Katello: Configure host for new content source"), :description => N_("Replace content source on the target machine"), :provided_inputs => [])
     RemoteExecutionFeature.register(:katello_module_stream_action, N_("Katello: Module Stream Actions"),
                                     :description => N_("Perform a module stream action via Katello interface"),
                                     :provided_inputs => ['action', 'module_spec', 'options'])

data/lib/katello/tasks/rubocop.rake

@@ -6,13 +6,4 @@ namespace :katello do
     system("bundle exec rubocop -D #{Katello::Engine.root}")
     exit($CHILD_STATUS.exitstatus)
   end
-
-  desc "Runs Rubocop style checker with xml output for Jenkins"
-  task 'rubocop:jenkins' do
-    system("bundle exec rubocop #{Katello::Engine.root} \
-            --require rubocop/formatter/checkstyle_formatter \
-            --format RuboCop::Formatter::CheckstyleFormatter \
-            --no-color --out rubocop.xml")
-    exit($CHILD_STATUS.exitstatus)
-  end
 end

data/lib/katello/tasks/unify_hosts.rake

@@ -130,7 +130,6 @@ namespace :katello do
       if sub_facet
         sub_facet.host = provisioning_host
         sub_facet.save!
-        sub_facet.update_subscription_status
       end
 
       provisioning_host.name = provisioning_host.name.downcase