katello 3.18.0.rc1 → 4.0.0.rc1

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_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/common/views/katello-agent-notice.html

@@ -1,7 +1,7 @@
 <section>
   <p bst-alert="warning" >
     <span translate>
-      Katello-agent is deprecated and will be removed in Katello 4.0.  Consider migrating to Remote Execution.
+      Katello-agent is deprecated and will be removed in a future release.
     </span>
   </p>
 </section>

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

@@ -1,8 +1,7 @@
 <div data-extend-template="components/views/bst-modal.html">
-  <h4 data-block="modal-header" translate>Content Host System Purpose</h4>
+  <h2 data-block="modal-header" translate>Assign System Purpose</h2>
 
   <div data-block="modal-body">
-    <h4 translate>Assign System Purpose:</h4>
 
     <div class="row">
       <div class="col-sm-12">
@@ -10,67 +9,63 @@
       </div>
     </div>
 
+    <div bst-alert="info">
+      <span translate>
+        This change will be applied to <b>{{ hostCount }} systems.</b>
+      </span>
+    </div>
+    <br />
+
     <form name="contentHostContentForm" class="form" ng-hide="content.workingMode">
-      <div>
-        <label translate>Service Level:</label>
+      <div><b>
+        <dl class="dl-horizontal dl-horizontal-left">
+        <dt><label translate>Service Level (SLA):</label></dt>
 
-        <select type="select"
-                ng-options="item for item in defaultServiceLevels"
-                ng-model="selectedServiceLevels">
-        </select>
-      <br /><br />
+        <dd><select type="select"
+                    ng-options="item for item in defaultServiceLevels"
+                    ng-model="selectedServiceLevels">
+        </select></dd>
+        <br /><br />
 
-        <label translate>Usage Type:</label>
+        <dt style="margin-left: -50px;"><label translate>Usage Type:</label></dt>
 
-        <select type="select"
+        <dd><select type="select"
                 ng-options="item for item in defaultUsages"
                 ng-model="selectedRoles">
-        </select>
+        </select></dd>
         <br /><br />
 
-        <label translate>Role:</label>
+        <dt style="margin-left: -98px;"><label translate>Role:</label></dt>
 
-        <select type="select"
+        <dd><select type="select"
                 ng-options="item for item in defaultRoles"
                 ng-model="selectedUsages">
-        </select>
+        </select></dd>
         <br /><br />
 
-        <label ng-hide="!purposeAddonsList().length" translate>Add ons:</label>
-        <div class="help-block" style="text-align:left;">
-          <p translate>ctrl-click or shift-click to select multiple Add ons</p>
-        </div>
+        <dt style="margin-left: -75px;"><label ng-hide="!purposeAddonsList().length" translate>Add ons:</label></dt>
 
-        <select multiple ng-multiple="true"
+        <dd><select multiple ng-multiple="true"
                 ng-hide="!purposeAddonsList().length"
                 ng-options="item for item in purposeAddonsList()"
                 ng-model="selectedAddons">
-        </select>
-        <br /><br />
-
-      </div>
-
-      <div bst-alert="info" ng-show="showConfirm">
-        <span translate>
-          Set System Purpose values on {{ hostCount }} selected content hosts?
-        </span>
-        <div>
-          <br />
-          <button type="button" class="btn btn-primary" ng-click="showConfirm = false; performAction()" translate>Assign</button>
+        </select></dd>
+        <div class="help-block" style="text-align:center; margin-left: -180px;">
+          <p translate>ctrl-click or shift-click to select multiple Add ons</p>
         </div>
+        <br /><br />
+        </dl></b>
       </div>
-
-      <button class="btn btn-primary"
-              type="button"
-              ng-hide="showConfirm"
-              ng-click="showConfirm = true;">
-        <span translate>Assign</span>
-      </button>
-
     </form>
   </div>
 
   <div data-block="modal-footer">
+    <button class="btn btn-primary"
+            type="button"
+            ng-click="performAction()">
+      <span translate>Assign</span>
+    </button>
+
     <button type="button" class="btn btn-default" ng-click="cancel()" translate>
       Cancel
     </button>

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,15 +14,15 @@
   <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 Katello 4.0.  Consider migrating to Remote Execution.
+      Katello-agent is deprecated and will be removed in a future release.
     </span>
     </p>
   </section>
 
   <p translate>Learn more about these packages in the <a href="https://theforeman.org/plugins/katello/">Documentation</a> </p>
-</li>
+</li></div>

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

@@ -0,0 +1,38 @@
+<div ng-controller="ContentHostRegisterController">
+<li ng-hide="noCapsulesFound">
+    <p translate>Select a Content Source:</p>
+    <p><select ng-model="selectedCapsule" ng-options="capsule.name for capsule in capsules.results"></select></p>
+</li>
+
+<li>
+  <p>Add the GPG public key used to sign DEB packages from your system to download the Debian/Ubuntu client from your system:</p>
+
+<pre><code>apt-get -y install gnupg
+mkdir -p /etc/apt/trusted.gpg.d
+wget "https://{{ noCapsulesFound ? katelloHostname : hostname(selectedCapsule.url) }}/pub/pulp_deb_signing.key" -O - | apt-key add -</code></pre>
+</li>
+
+<li>
+Create a new repository file which contains the Debian/Ubuntu client. This example chooses Ubuntu 20.04:
+
+<pre><code>mkdir -p /etc/apt/sources.list.d
+cat &lt /etc/apt/sources.list &lt&lt'EOF'
+deb http://{{  noCapsulesFound ? katelloHostname : hostname(selectedCapsule.url) }}/pulp/deb/{{ organization.label }}/Library/custom/Ubuntu_Client/Ubuntu_Client_20_04/ default all
+EOF</code></pre>
+<p>Here Ubuntu_Client is a product name, Ubuntu_Client_20_04 is the repository inside the product, and Library is a lifecycle environment.</p>
+</li>
+<li>
+Install apt-transport-katello and katello-upload-profile. This depends on and automatically installs the subscription-manager for Debian/Ubuntu:
+
+<pre><code>apt-get update && apt-get -y install apt-transport-katello katello-upload-profile</code></pre></li>
+<li>
+Download and execute a script from your system to install all necessary certificates:
+
+<pre><code>wget --no-check-certificate -O katello-rhsm-consumer https://{{ noCapsulesFound ? katelloHostname : hostname(selectedCapsule.url) }}/pub/katello-rhsm-consumer
+/bin/bash -x katello-rhsm-consumer 2&lt /root/katello-rhsm-consumer.log</code></pre></li>
+<li>
+Register your host with an appropriate activation key:
+
+<pre><code>subscription-manager register --org="{{ organization.label }}" --name="&ltHost Name&gt" --activationkey="&ltActivation Key Name&gt"</code></pre>
+
+</li></div>

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

@@ -0,0 +1,5 @@
+<li>
+    <p translate>Install the Subscription Manager package:</p>
+    <pre><code>yum install -y subscription-manager</code></pre>
+</li>
+<register-client/>

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

@@ -0,0 +1,28 @@
+<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>
+
+  <p translate>To report package & errata information:</p>
+  <pre><code>zypper -y install katello-host-tools</code></pre>
+
+  <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>zypper -y install katello-host-tools-tracer</code></pre>
+
+  <p translate>For remote actions via katello-agent:</p>
+  <pre><code>zypper -y install katello-agent</code></pre>
+  <section>
+    <p bst-alert="warning" >
+    <span translate>
+      Katello-agent is deprecated and will be removed in Katello 4.0.  Consider migrating to Remote Execution.
+    </span>
+    </p>
+  </section>
+
+  <p translate>Learn more about these packages in the <a href="https://theforeman.org/plugins/katello/">Documentation</a> </p>
+</li></div>

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

@@ -9,22 +9,25 @@
   <div data-block="content">
     <p translate>To register a content host to this server, follow these steps.</p>
     <ol>
-      <li ng-hide="noCapsulesFound">
+      <li>
+        <p>Select an Operating System:</p>
+        <p><select ng-init="selectedUserOs = 'client'" ng-model="selectedUserOs">
+          <option value="client">CentOS/RHEL</option>
+          <option value="deb-client">Debian/Ubuntu</option>
+          <option value="oracle-client">OracleLinux</option>
+          <option value="sles-client">SLES/Suse</option>
+        </select></p>
+      </li>
+      <li ng-hide="noCapsulesFound || selectedUserOs == 'deb-client'">
         <p translate>Select a Content Source:</p>
         <p><select ng-model="selectedCapsule" ng-options="capsule.name for capsule in capsules.results"></select></p>
       </li>
-      <li>
+      <li ng-hide="selectedUserOs === 'deb-client'">
         <p translate>Install the pre-built bootstrap RPM:</p>
-        <pre><code>curl --insecure --output {{ consumerCertRPM }} https://{{ noCapsulesFound ? katelloHostname : hostname(selectedCapsule.url) }}/pub/{{ consumerCertRPM }}<br />yum localinstall {{ consumerCertRPM }} </code></pre>
+        <pre><code>curl --insecure --output {{ consumerCertRPM }} https://{{ noCapsulesFound ? katelloHostname : hostname(selectedCapsule.url) }}/pub/{{ consumerCertRPM }}<br />{{(selectedUserOs === 'sles-client') ? 'zypper' : 'yum' }} localinstall {{ consumerCertRPM }} </code></pre>
       </li>
-      <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>
-      <register-client />
+
+      <register-os-client user-os="selectedUserOs"></register-os-client>
     </ol>
   </div>
 </section>

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

@@ -13,8 +13,8 @@
  *   within the table.
  */
 angular.module('Bastion.content-views').controller('ContentViewsController',
-    ['$scope', 'Nutupane', 'ContentView', 'CurrentOrganization',
-    function ($scope, Nutupane, ContentView, CurrentOrganization) {
+    ['$scope', 'Nutupane', 'ContentView', 'CurrentOrganization', 'RepositoryTypesService',
+    function ($scope, Nutupane, ContentView, CurrentOrganization, RepositoryTypesService) {
 
         var nutupane = new Nutupane(ContentView, {
             'nondefault': true,
@@ -26,5 +26,9 @@ angular.module('Bastion.content-views').controller('ContentViewsController',
         $scope.controllerName = 'katello_content_views';
 
         $scope.table = nutupane.table;
+
+        $scope.importOnlyEnabled = function() {
+            return RepositoryTypesService.pulp3Supported('yum');
+        };
     }]
 );

data/engines/bastion_katello/app/assets/javascripts/bastion_katello/content-views/deletion/content-view-version-deletion-activation-keys.controller.js

@@ -16,16 +16,20 @@
 angular.module('Bastion.content-views').controller('ContentViewVersionDeletionActivationKeysController',
     ['$scope', '$location', 'Organization', 'CurrentOrganization', 'Nutupane', 'ActivationKey',
     function ($scope, $location, Organization, CurrentOrganization, Nutupane, ActivationKey) {
-        var params, nutupane;
+        var params, nutupane, nutupaneParams;
 
         $scope.validateEnvironmentSelection();
         params = {
             'organization_id': CurrentOrganization,
-            'content_view_id': $scope.contentView.id,
             'sort_by': 'name',
             'sort_order': 'ASC'
         };
-        nutupane = new Nutupane(ActivationKey, params);
+
+        nutupaneParams = {
+            'disableAutoLoad': true
+        };
+
+        nutupane = new Nutupane(ActivationKey, params, undefined, nutupaneParams);
         $scope.controllerName = 'katello_activation_keys';
 
         nutupane.searchTransform = function (term) {
@@ -43,6 +47,7 @@ angular.module('Bastion.content-views').controller('ContentViewVersionDeletionAc
 
             return term + " AND " + addition;
         };
+        nutupane.load();
 
         $scope.table = nutupane.table;
         $scope.table.closeItem = function () {};

data/engines/bastion_katello/app/assets/javascripts/bastion_katello/content-views/deletion/content-view-version-deletion-content-hosts.controller.js

@@ -17,16 +17,20 @@ angular.module('Bastion.content-views').controller('ContentViewVersionDeletionCo
     ['$scope', '$location', 'Organization', 'CurrentOrganization', 'Nutupane', 'Host',
     function ($scope, $location, Organization, CurrentOrganization, Nutupane, Host) {
 
-        var params, nutupane;
+        var params, nutupane, nutupaneParams;
 
         $scope.validateEnvironmentSelection();
         params = {
             'organization_id': CurrentOrganization,
-            'content_view_id': $scope.contentView.id,
             'sort_by': 'name',
             'sort_order': 'ASC'
         };
-        nutupane = new Nutupane(Host, params);
+
+        nutupaneParams = {
+            'disableAutoLoad': true
+        };
+
+        nutupane = new Nutupane(Host, params, undefined, nutupaneParams);
         $scope.controllerName = 'hosts';
 
         nutupane.searchTransform = function (term) {
@@ -44,6 +48,8 @@ angular.module('Bastion.content-views').controller('ContentViewVersionDeletionCo
 
             return term + " AND " + addition;
         };
+
+        nutupane.load();
         $scope.table = nutupane.table;
         $scope.table.closeItem = function () {};