katello 3.18.5 → 4.0.0.rc1

data/app/services/katello/pulp3/repository.rb

@@ -48,6 +48,10 @@ module Katello
         nil
       end
 
+      def published?
+        !repo.publication_href.nil?
+      end
+
       def skip_types
         nil
       end
@@ -158,7 +162,10 @@ module Katello
       end
 
       def compute_remote_options(computed_options = remote_options)
-        computed_options.except(:name, :client_key)
+        [:client_cert, :client_key, :ca_cert].each do |key|
+          computed_options[key] = Digest::SHA256.hexdigest(computed_options[key].chomp) if computed_options[key]
+        end
+        computed_options.except(:name)
       end
 
       def create
@@ -218,38 +225,11 @@ module Katello
       end
 
       def refresh_distributions
-        if repo.docker?
-          dist = lookup_distributions(base_path: repo.container_repository_name).first
+        dist_ref = distribution_reference
+        if dist_ref
+          update_distribution
         else
-          dist = lookup_distributions(base_path: repo.relative_path).first
-        end
-
-        # First check if the distribution exists
-        if dist
-          dist_ref = distribution_reference
-          # If we have a DistributionReference, update the distribution
-          if dist_ref
-            return update_distribution
-          # If no DistributionReference, create a DistributionReference and return
-          else
-            save_distribution_references([dist.pulp_href])
-            return []
-          end
-        end
-
-        # So far, it looks like there is no distribution. Try to create one.
-        begin
           create_distribution(relative_path)
-        rescue api.class.client_module::ApiError => e
-          # Now it seems there is a distribution. Fetch it and save the reference.
-          if e.message.include?("\"base_path\":[\"This field must be unique.\"]") ||
-              e.message.include?("\"base_path\":[\"Overlaps with existing distribution\"")
-            dist = lookup_distributions(base_path: repo.relative_path).first
-            save_distribution_references([dist.pulp_href])
-            return []
-          else
-            raise e
-          end
         end
       end
 
@@ -299,8 +279,7 @@ module Katello
           pulp3_distribution_data = api.get_distribution(href)
           path, content_guard_href = pulp3_distribution_data&.base_path, pulp3_distribution_data&.content_guard
           unless distribution_reference
-            # Ensure that duplicates won't be created in the case of a race condition
-            DistributionReference.where(path: path, href: href, repository_id: repo.id, content_guard_href: content_guard_href).first_or_create!
+            DistributionReference.create!(path: path, href: href, repository_id: repo.id, content_guard_href: content_guard_href)
           end
         end
       end
@@ -330,7 +309,7 @@ module Katello
         }
         remote_options[:url] = root.url unless root.url.blank?
         remote_options[:download_concurrency] = root.download_concurrency unless root.download_concurrency.blank?
-        if !root.upstream_username.blank? && !root.upstream_password.blank?
+        if root.upstream_username && root.upstream_password
           remote_options.merge!(username: root.upstream_username,
                                password: root.upstream_password)
         end

data/app/services/katello/pulp3/rpm.rb

@@ -111,10 +111,6 @@ module Katello
         backend_data['rpm_license']
       end
 
-      def parse_filename(path)
-        File.split(path).last unless path.blank?
-      end
-
       def update_model(model)
         custom_json = {}
         custom_json['modular'] = backend_data['is_modular']
@@ -123,7 +119,7 @@ module Katello
           each { |field| custom_json[field] = backend_data[field] }
         custom_json['release_sortable'] = Util::Package.sortable_version(backend_data['release'])
         custom_json['version_sortable'] = Util::Package.sortable_version(backend_data['version'])
-        custom_json['filename'] = parse_filename(backend_data['location_href']) #location_href is the relative path of the rpm in the upstream repo
+        custom_json['filename'] = backend_data['location_href']
         custom_json['checksum'] = backend_data['pkgId']
         custom_json['sourcerpm'] = backend_data['rpm_sourcerpm']
         model.assign_attributes(custom_json)

data/app/services/katello/pulp3/task.rb

@@ -56,10 +56,8 @@ module Katello
         @pulp_data ||= tasks_api.read(@href).as_json.with_indifferent_access
       end
 
-      delegate :tasks_api, to: :core_api
-
-      def core_api
-        ::Katello::Pulp3::Api::Core.new(@smart_proxy)
+      def tasks_api
+        ::Katello::Pulp3::Api::Core.new(@smart_proxy).tasks_api
       end
 
       def task_group_href
@@ -96,11 +94,10 @@ module Katello
       end
 
       def cancel
-        core_api.cancel_task(task_data['pulp_href'])
+        data = PulpcoreClient::TaskResponse.new(state: 'canceled')
+        tasks_api.tasks_cancel(task_data['pulp_href'], data)
         #the main task may have completed, so cancel spawned tasks too
-        task_data['spawned_tasks']&.each do |spawned|
-          core_api.cancel_task(spawned['pulp_href'])
-        end
+        task_data['spawned_tasks']&.each { |spawned| tasks_api.tasks_cancel(spawned['pulp_href'], data) }
       end
     end
   end

data/app/services/katello/pulp3/task_group.rb

@@ -71,25 +71,17 @@ module Katello
       end
 
       def error
-        return if task_group_data[WAITING] > 0 || task_group_data[RUNNING] > 0
         if task_group_data[FAILED] > 0
           "#{task_group_data[FAILED]} subtask(s) failed for task group #{@href}."
-        elsif task_group_data[CANCELLED] > 0
-          "#{task_group_data[CANCELLED]} subtask(s) cancelled for task group #{@href}."
         end
       end
 
-      def core_api
-        ::Katello::Pulp3::Api::Core.new(@smart_proxy)
-      end
-
       def cancel
-        tasks_api = core_api.tasks_api
-        tasks_response = core_api.class.fetch_from_list do |page_opts|
-          tasks_api.list(page_opts.merge(task_group: task_group_data['pulp_href'], state__in: 'running,waiting'))
-        end
-        tasks_response.collect do |result|
-          ::Katello::Pulp3::Api::Core.new(@smart_proxy).cancel_task(result.pulp_href)
+        tasks_api = ::Katello::Pulp3::Api::Core.new(@smart_proxy).tasks_api
+        tasks_response = tasks_api.list(task_group: task_group_data['pulp_href'])
+        data = PulpcoreClient::TaskResponse.new(state: 'canceled')
+        tasks_response.results.collect do |result|
+          tasks_api.tasks_cancel(result.pulp_href, data)
         end
       end
     end

data/app/services/katello/repository_type.rb

@@ -33,7 +33,7 @@ module Katello
     end
 
     def content_types_to_index
-      if SmartProxy.pulp_primary.pulp3_repository_type_support?(self)
+      if SmartProxy.pulp_primary&.pulp3_repository_type_support?(self)
         # type.index being false supersedes type.index_on_pulp3 being true
         @content_types.select { |type| type.index && type.index_on_pulp3 }
       else

data/app/views/foreman/smart_proxies/_content_tab.html.erb

@@ -1,48 +1,5 @@
-<br />
+<%= javascript_include_tag *webpack_asset_paths('katello', extension: 'js') %>
 
-<table class="table table-bordered">
-  <thead>
-    <tr>
-      <th translate>Content View Name</th>
-      <th translate>Composite</th>
-      <th translate>Last Published</th>
-      <th translate>Hosts</th>
-      <th translate>Products</th>
-      <th translate>Apt repos</th>
-      <th translate>Yum repos</th>
-      <th translate>Container Image repos</th>
-      <th translate>Deb Packages</th>
-      <th translate>RPM Packages</th>
-      <th translate>Errata</th>
-      <th translate>Puppet modules</th>
-    </tr>
-  </thead>
-  <tbody>
-    <tr ng-repeat-start="env in syncStatus.lifecycle_environments">
-      <td colspan="10"
-          ng-click="toggleExpandEnvironment(env)"
-          class="expander {{isEnvronmentExpanded(env) ? '' : 'collapsed'}}">
-        <span class="caret"></span>
-        {{ env.name }}
-      </td>
-    </tr>
-    <tr ng-repeat-end ng-repeat="cv in env.content_views" ng-show="isEnvronmentExpanded(env)">
-      <td>
-        <a href="{{ productsOrVersionUrl(cv.default, cv.id) }}" target="_self">
-          {{ cv.name }}
-        </a>
-      </td>
-      <td>{{ cv.composite | booleanToYesNo }}</td>
-      <td>{{ cv.last_published }}</td>
-      <td>{{ cv.counts.content_hosts }}</td>
-      <td>{{ cv.counts.products }}</td>
-      <td>{{ cv.counts.apt_repositories }}</td>
-      <td>{{ cv.counts.yum_repositories }}</td>
-      <td>{{ cv.counts.docker_repositories }}</td>
-      <td>{{ cv.counts.deb_packages }}</td>
-      <td>{{ cv.counts.packages }}</td>
-      <td>{{ cv.counts.errata }}</td>
-      <td>{{ cv.counts.puppet_modules }}</td>
-    </td>
-  </tbody>
-</table>
+<br />
+<% @smartProxyId= @smart_proxy.id %>
+<%= react_component('Content', smartProxyId: @smartProxyId,)  %>

data/app/views/foreman/smart_proxies/show.html.erb

@@ -1,4 +1,4 @@
-<% if @smart_proxy.has_feature?(SmartProxy::PULP_NODE_FEATURE) -%>
+<% if @smart_proxy.pulp_mirror? -%>
   <div ng-controller="CapsuleContentController">
     <%= render :file => 'smart_proxies/show' %>
   </div>

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

@@ -17,33 +17,30 @@ child @lifecycle_environments => :lifecycle_environments do
   node :syncable do |env|
     @capsule.environment_syncable?(env)
   end
-  node :counts do |env|
-    counts = {
-      :content_hosts => env.hosts.authorized("view_hosts").count,
-      :content_views => env.content_views.non_default.count,
-      :products => env.products.enabled.count
-    }
-    repo_data = @capsule.smart_proxy_service.current_repositories_data(env)
-    counts.merge!(Katello::Pulp::ContentCountsCalculator.new(repo_data).calculate)
-  end
 
-  node :content_views do |env|
-    env.content_views.map do |content_view|
-      attributes = {
-        :id => content_view.id,
-        :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,
-        :default => content_view.default,
-        :counts => {
-          :content_hosts => content_view.hosts.authorized("view_hosts").count,
-          :products => content_view.products.enabled.count
-        }
+  if @capsule.has_feature?(SmartProxy::PULP_NODE_FEATURE) || @capsule.has_feature?(SmartProxy::PULP3_FEATURE)
+    node :counts do |env|
+      {
+        :content_views => env.content_views.non_default.count
       }
-      repo_data = @capsule.smart_proxy_service.current_repositories_data(env, content_view)
-      attributes[:counts].merge!(Katello::Pulp::ContentCountsCalculator.new(repo_data).calculate)
-      attributes
+    end
+
+    node :content_views do |env|
+      env.content_views.map do |content_view|
+        attributes = {
+          :id => content_view.id,
+          :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,
+          :default => content_view.default,
+          :up_to_date => @capsule.repos_pending_sync(env, content_view).empty?,
+          :counts => {
+            :repositories => @capsule.current_repositories_data(env, content_view).try(:count)
+          }
+        }
+        attributes
+      end
     end
   end
 end

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

@@ -1,6 +1,7 @@
 object @resource
 
 attributes :destination_server, :path, :id, :metadata
+attributes :export_type => :type
 
 node :content_view_version do |h|
   h.content_view_version.name

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

@@ -4,17 +4,15 @@ extends "api/v2/taxonomies/show"
 
 attributes :task_id, :label, :redhat_repository_url
 
-if ::SETTINGS[:katello][:use_cp]
-  attributes :system_purposes, :system_purposes
-  attributes :service_levels, :service_level
+attributes :system_purposes, :system_purposes
+attributes :service_levels, :service_level
 
-  node :simple_content_access do |org|
-    org.simple_content_access?
-  end
+node :simple_content_access do |org|
+  org.simple_content_access?
+end
 
-  node :owner_details do |org|
-    partial('katello/api/v2/organizations/owner_details', object: OpenStruct.new(org.owner_details))
-  end
+node :owner_details do |org|
+  partial('katello/api/v2/organizations/owner_details', object: OpenStruct.new(org.owner_details))
 end
 
 node :default_content_view_id do |org|

data/app/views/katello/sync_management/_products.html.erb

@@ -42,5 +42,5 @@
     </tbody>
   </table>
 
-  <%= submit_tag _('Synchronize Now'), :class => 'btn btn-default fr', :id => 'sync_button' %>
+  <%= submit_tag _('Synchronize Now'), :class => 'button fr', :id => 'sync_button' %>
 <% end %>

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

@@ -3,10 +3,7 @@
   <%= javascript_include_tag 'katello/organizations/download_certificate' %>
 
   <%= text_f f, :label, :disabled => true, :class => 'input-xlarge' %>
-
-  <% if ::SETTINGS[:katello][:use_cp] %>
-    <%= selectable_f(f, :service_level, options_for_select(service_level_options, service_level_selected), {}, :label => _('Default System SLA')) %>
-  <% end %>
+  <%= selectable_f(f, :service_level, options_for_select(service_level_options, service_level_selected), {}, :label => _('Default System SLA')) %>
 
   <%= field(f, _('Debug Certificate'),
             :help_inline => _('This certificate allows a user to view the repositories in any environment from a browser.')) do

data/app/views/overrides/smart_proxies/_environment_tab.html.erb

@@ -1,4 +1,4 @@
-<% if !@smart_proxy.new_record? && @smart_proxy.has_feature?(SmartProxy::PULP_NODE_FEATURE) -%>
+<% if !@smart_proxy.new_record? && @smart_proxy.pulp_mirror? -%>
   <li id="kt_environments_tab">
     <a href="#kt_environments" data-toggle="tab"><%= _('Lifecycle Environments') %></a>
   </li>

data/app/views/overrides/smart_proxies/_environment_tab_pane.html.erb

@@ -1,4 +1,4 @@
-<% if !@smart_proxy.new_record? && @smart_proxy.has_feature?(SmartProxy::PULP_NODE_FEATURE) -%>
+<% if !@smart_proxy.new_record? && @smart_proxy.pulp_mirror? -%>
   <div class="tab-pane" id="kt_environments">
     <%= multiple_selects f, :lifecycle_environments, Katello::KTEnvironment.completer_scope(:organization_id => ::Organization.current.try(:id)), @smart_proxy.lifecycle_environment_ids, {:label => _('Lifecycle Environments')}, @smart_proxy.default_capsule? ? {:disabled => :disabled } : {}  %>
 

data/config/katello.yaml.example

@@ -10,9 +10,6 @@
     :ostree: true
     :ansible_collection: true
 
-  :use_cp: true # set to true/false if you want to override default
-  :use_pulp: true # set to true/false if you want to override default
-
   :rest_client_timeout: 30
   :gpg_strict_validation: false
 

data/config/routes/api/v2.rb

@@ -207,14 +207,6 @@ Katello::Engine.routes.draw do
           end
         end
 
-        api_resources :gpg_keys, :only => [:index, :show, :create, :update, :destroy] do
-          member do
-            get :content
-            post :content, :action => :set_content
-          end
-          get :auto_complete_search, :on => :collection
-        end
-
         api_resources :host_collections, :only => [:index, :show, :create, :update, :destroy] do
           member do
             post :copy
@@ -360,8 +352,6 @@ Katello::Engine.routes.draw do
             end
           end
 
-          api_resources :gpg_keys, :only => [:index]
-
           api_resources :content_views, :only => [:index, :create]
           api_resources :subscriptions, :only => [:index, :upload, :delete_manifest, :refresh_manifest, :show] do
             collection do
@@ -371,6 +361,14 @@ Katello::Engine.routes.draw do
             end
           end
 
+          api_resources :simple_content_access, only: [] do
+            collection do
+              put :enable
+              put :disable
+              get :eligible
+            end
+          end
+
           api_resources :upstream_subscriptions, only: [:index, :create] do
             collection do
               delete :destroy

data/db/migrate/20191204214919_add_content_view_version_counts.rb

@@ -2,6 +2,5 @@ class AddContentViewVersionCounts < ActiveRecord::Migration[5.2]
   def change
     add_column :katello_content_view_versions, :content_counts, :text
     Katello::ContentViewVersion.reset_column_information
-    Katello::ContentViewVersion.all.each(&:update_content_counts!)
   end
 end

data/db/migrate/20200514092553_move_katello_fields_from_hostgroups.katello.rb

@@ -46,7 +46,7 @@ class MoveKatelloFieldsFromHostgroups < ActiveRecord::Migration[6.0]
         content_facet.kickstart_repository_id = kickstart_repository_id
         content_facet.content_view_id = content_view_id
         content_facet.lifecycle_environment_id = lifecycle_environment_id
-        unless content_facet.save(validate: false)
+        unless content_facet.save
           Rails.logger.warn("Unable to save content facet hostgroup for #{content_facet.inspect} ")
           Rails.logger.warn(content_facet.errors.full_messages.join("\n"))
         end

data/db/migrate/20210119162528_delete_puppet_and_ostree_repos.rb

@@ -0,0 +1,56 @@
+class DeletePuppetAndOstreeRepos < ActiveRecord::Migration[6.0]
+  class FakeContentViewPuppetModule < Katello::Model
+    self.table_name = 'katello_content_view_puppet_modules'
+  end
+
+  class FakeContentViewPuppetEnvironmentPuppetModule < Katello::Model
+    self.table_name = 'katello_content_view_puppet_environment_puppet_modules'
+  end
+
+  class FakeRepositoryPuppetModule < Katello::Model
+    self.table_name = 'katello_repository_puppet_modules'
+  end
+
+  class FakeContentViewPuppetEnvironment < Katello::Model
+    self.table_name = 'katello_content_view_puppet_environments'
+  end
+  class FakePuppetModule < Katello::Model
+    self.table_name = 'katello_puppet_modules'
+  end
+  class FakeRepositoryOstreeBranch < Katello::Model
+    self.table_name = 'katello_repository_ostree_branches'
+  end
+  class FakeOstreeBranch < Katello::Model
+    self.table_name = 'katello_ostree_branches'
+  end
+
+  def up
+    if Katello::Repository.ostree_type.any? || Katello::Repository.puppet_type.any?
+      User.as_anonymous_admin do
+        FakeContentViewPuppetModule.delete_all
+        FakeContentViewPuppetEnvironmentPuppetModule.delete_all
+        FakeRepositoryPuppetModule.delete_all
+
+        FakeContentViewPuppetEnvironment.delete_all
+        FakePuppetModule.delete_all
+
+        Katello::Repository.puppet_type.delete_all
+
+        FakeRepositoryOstreeBranch.delete_all
+        FakeOstreeBranch.delete_all
+        Katello::Repository.ostree_type.where.not(:library_instance_id => nil, :environment_id => nil).destroy_all #CV LCE repos
+        Katello::Repository.ostree_type.where.not(:library_instance_id => nil).destroy_all # archive repos
+        Katello::Repository.ostree_type.destroy_all #all the rest (should just be library repos)
+
+        Katello::ContentViewVersion.where.not(:content_counts => nil).each do |version|
+          version.content_counts.except!('ostree', 'puppet_module')
+          version.save
+        end
+      end
+    end
+  end
+
+  def down
+    fail ActiveRecord::IrreversibleMigration
+  end
+end

data/db/migrate/20210128231228_add_type_and_from_cvv_to_cvv_export_history.rb

@@ -0,0 +1,14 @@
+class AddTypeAndFromCvvToCvvExportHistory < ActiveRecord::Migration[6.0]
+  def change
+    add_column :katello_content_view_version_export_histories,
+               :export_type, :string,
+               :default => ::Katello::ContentViewVersionExportHistory::COMPLETE, :null => false
+    add_index :katello_content_view_version_export_histories, :export_type, name: 'katello_cvveh_export_type'
+
+    ::Katello::ContentViewVersionExportHistory.reset_column_information
+    ::Katello::ContentViewVersionExportHistory.all.each do |cvve|
+      next if cvve.export_type == cvve.export_type_from_metadata
+      cvve.update!(export_type: cvve.export_type_from_metadata)
+    end
+  end
+end

data/db/migrate/20210201163238_migrate_background_download_policy_to_migrate.rb

@@ -0,0 +1,7 @@
+class MigrateBackgroundDownloadPolicyToMigrate < ActiveRecord::Migration[6.0]
+  def change
+    Katello::RootRepository.where(:download_policy => ::Runcible::Models::YumImporter::DOWNLOAD_BACKGROUND).each do |root_repo|
+      root_repo.update_column(:download_policy, ::Runcible::Models::YumImporter::DOWNLOAD_IMMEDIATE)
+    end
+  end
+end

data/db/seeds.d/104-proxy.rb

@@ -16,7 +16,7 @@ User.as(::User.anonymous_api_admin.login) do
     fail "Unable to create proxy feature: #{format_errors feature}"
   end
 
-  ["Pulp", "Pulp Node", "Pulpcore"].each do |input|
+  ["Pulp", "Pulp Node", "Pulpcore", "Container_Gateway"].each do |input|
     f = Feature.where(:name => input).first_or_create
     fail "Unable to create proxy feature: #{format_errors f}" if f.nil? || f.errors.any?
   end

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

@@ -14,6 +14,7 @@ UpgradeTask.define_tasks(:katello) do
     {:name => 'katello:upgrades:3.15:set_sub_facet_dmi_uuid'},
     {:name => 'katello:upgrades:3.15:reindex_rpm_modular'},
     {:name => 'katello:upgrades:3.16:update_applicable_el8_hosts'},
-    {:name => 'katello:upgrades:3.18:add_cvv_export_history_metadata'}
+    {:name => 'katello:upgrades:3.18:add_cvv_export_history_metadata'},
+    {:name => 'katello:upgrades:4.0:remove_ostree_puppet_content'}
   ]
 end

data/engines/bastion/app/assets/javascripts/bastion/auth/authorization.service.js

@@ -20,7 +20,7 @@ angular.module('Bastion.auth').service('Authorization', ['CurrentUser', 'Permiss
                 allowedTo = model.permissions[permissionName];
             } else {
                 angular.forEach(Permissions, function (permission) {
-                    if (permission.name === permissionName) {
+                    if (permission.permission.name === permissionName) {
                         allowedTo = true;
                     }
                 });

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

@@ -116,7 +116,7 @@ angular.module('Bastion.capsule-content').controller('CapsuleContentController',
         };
 
         $scope.syncState = syncState;
-
+        $scope.smartProxyId = capsuleId;
         $scope.expandEnvironments = {};
 
         refreshSyncStatus();

data/engines/bastion_katello/app/assets/javascripts/bastion_katello/content-hosts/content-host-register-os-client.directive.js

@@ -0,0 +1,17 @@
+angular.module('Bastion.content-hosts').directive('registerOsClient', function () {
+    return {
+    restrict: 'E',
+    scope: {
+      userOs: '='
+    },
+    link: function($scope) {
+        $scope.$watch('userOs', function(userOs) {
+            if (userOs && userOs.length) {
+                $scope.dynamicTemplateUrl = 'content-hosts/views/register-' + userOs + '.html';
+            }
+        });
+    },
+
+    template: '<ng-include src="dynamicTemplateUrl"></ng-include>'
+  };
+});

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

@@ -323,7 +323,7 @@
 
       <dl class="dl-horizontal dl-horizontal-left">
         <dt translate>Registered</dt>
-        <dd><short-date-time date="host.created_at" /></dd>
+        <dd><long-date-time date="host.created_at" /></dd>
 
         <dt translate> Registered By</dt>
         <dd>
@@ -350,7 +350,7 @@
         </dd>
 
         <dt translate>Last Checkin</dt>
-        <dd><short-date-time date="host.subscription_facet_attributes.last_checkin" default="'Never checked in' | translate" /></dd>
+        <dd><long-date-time date="host.subscription_facet_attributes.last_checkin" default="'Never checked in' | translate" /></dd>
       </dl>
 
       <div class="divider"></div>

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

@@ -131,8 +131,8 @@
           <td bst-table-cell>{{ host.operatingsystem_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><short-date-time date="host.subscription_facet_attributes.registered_at" default="'Never registered' | translate" /></td>
-          <td bst-table-cell><short-date-time date="host.subscription_facet_attributes.last_checkin" default="'Never checked in' | translate" /></td>
+          <td bst-table-cell><long-date-time date="host.subscription_facet_attributes.registered_at" default="'Never registered' | translate" /></td>
+          <td bst-table-cell><long-date-time date="host.subscription_facet_attributes.last_checkin" default="'Never checked in' | translate" /></td>
         </tr>
       </tbody>
     </table>

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

@@ -1,3 +1,10 @@
+<div ng-controller="ContentHostRegisterController"><li>
+        <p translate>Register using subscription-manager:</p>
+        <p translate>Using an Activation Key:</p>
+        <pre><code>subscription-manager register --org="{{ organization.label }}" --activationkey="&ltActivation Key Name&gt"</code></pre>
+        <p translate>Using a username and password:</p>
+        <pre><code>subscription-manager register --org="{{ organization.label }}" --environment="Library"</code></pre>
+      </li>
 <li>
   <p translate>Install client package:</p>
 
@@ -7,9 +14,9 @@
   <p translate>Tracer helps administrators identify applications that need to be restarted after a system is patched. To optionally report tracer information:</p>
   <pre><code>yum -y install katello-host-tools-tracer</code></pre>
 
-  <p translate>For remote actions via katello-agent:</p>
-  <pre><code>yum -y install katello-agent</code></pre>
-  <section>
+  <p  ng-hide="remoteExecutionByDefault" translate>For remote actions via katello-agent:</p>
+  <pre ng-hide="remoteExecutionByDefault" ><code>yum -y install katello-agent</code></pre>
+  <section ng-hide="remoteExecutionByDefault" >
     <p bst-alert="warning" >
     <span translate>
       Katello-agent is deprecated and will be removed in a future release.
@@ -18,4 +25,4 @@
   </section>
 
   <p translate>Learn more about these packages in the <a href="https://theforeman.org/plugins/katello/">Documentation</a> </p>
-</li>
+</li></div>