katello 3.17.3 → 3.18.0.rc1

data/lib/katello/permissions/host_permissions.rb

@@ -28,6 +28,7 @@ Foreman::AccessControl.permission(:edit_hosts).actions.concat [
   'katello/api/v2/hosts_bulk_actions/release_version',
   'katello/api/v2/hosts_bulk_actions/traces',
   'katello/api/v2/hosts_bulk_actions/resolve_traces',
+  'katello/api/v2/hosts_bulk_actions/system_purpose',
   'katello/api/rhsm/candlepin_dynflow_proxy/upload_package_profile',
   'katello/api/rhsm/candlepin_dynflow_proxy/upload_profiles',
   'katello/api/rhsm/candlepin_dynflow_proxy/deb_package_profile',

data/lib/katello/plugin.rb

@@ -280,6 +280,9 @@ 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 Global Registration endpoint
+  extend_allowed_registration_vars :activation_key
+
   extend_page "smart_proxies/show" do |cx|
     cx.add_pagelet :details_content,
                    :name => _('Storage'),
@@ -355,7 +358,7 @@ Foreman::Plugin.register :katello do
   role 'Register hosts', [
     :view_hostgroups, :view_activation_keys, :view_hosts,
     :create_hosts, :edit_hosts, :destroy_hosts,
-    :view_content_views, :view_gpg_keys, :view_subscriptions,
+    :view_content_views, :view_content_credentials, :view_subscriptions,
     :attach_subscriptions, :view_host_collections,
     :view_organizations, :view_lifecycle_environments, :view_products,
     :view_locations, :view_domains, :view_architectures,

data/lib/katello/repository_types/deb.rb

@@ -1,6 +1,14 @@
 Katello::RepositoryTypeManager.register(::Katello::Repository::DEB_TYPE) do
   service_class Katello::Pulp::Repository::Deb
+  pulp3_service_class Katello::Pulp3::Repository::Apt
+  pulp3_api_class Katello::Pulp3::Api::Apt
+  pulp3_plugin 'pulp_deb'
   prevent_unneeded_metadata_publish
+
   default_managed_content_type Katello::Deb
-  content_type Katello::Deb, :pulp2_service_class => ::Katello::Pulp::Deb, :removable => true, :uploadable => true
+  content_type Katello::Deb,
+    :pulp2_service_class => ::Katello::Pulp::Deb,
+    :pulp3_service_class => ::Katello::Pulp3::Deb,
+    :removable => true,
+    :uploadable => true
 end

data/lib/katello/tasks/pulp3_content_switchover.rake

@@ -1,11 +1,9 @@
-load "#{Katello::Engine.root}/lib/katello/tasks/common.rake"
-
 require File.expand_path("../engine", File.dirname(__FILE__))
 require "#{Katello::Engine.root}/app/services/katello/pulp3/migration_switchover"
 
 namespace :katello do
   desc "Runs a Pulp 3 migration of pulp3 hrefs to pulp ids for supported content types."
-  task :pulp3_content_switchover => [:environment, :disable_dynflow] do
+  task :pulp3_content_switchover => :environment do
     begin
       User.current = User.anonymous_admin
 

data/lib/katello/tasks/pulp3_migration_stats.rake

@@ -0,0 +1,21 @@
+namespace :katello do
+  desc "Retrieve Pulp 2 -> Pulp 3 content migration stats"
+  task :pulp3_migration_stats => [:environment] do
+    User.current = User.anonymous_admin
+
+    migrated_rpms = ::Katello::Rpm.where('pulp_id LIKE ?', '%/pulp/api/v3/content/rpm/packages/%').
+      or(::Katello::Rpm.where.not(migrated_pulp3_href: nil)).count
+    migrated_errata = ::Katello::RepositoryErratum.where.not(erratum_pulp3_href: nil).count
+    migrated_repos = ::Katello::Repository.where.not(version_href: nil).count
+    migratable_repos = ::Katello::Repository.count - ::Katello::Repository.puppet_type.count -
+      ::Katello::Repository.ostree_type.count - ::Katello::Repository.deb_type.count
+
+    puts
+    puts "Migrated/Total RPMs: #{migrated_rpms}/#{::Katello::Rpm.count}"
+    puts "Migrated/Total errata: #{migrated_errata}/#{::Katello::RepositoryErratum.count}"
+    puts "Migrated/Total repositories: #{migrated_repos}/#{migratable_repos}"
+    puts
+    puts "\e[33mNote:\e[0m ensure there is sufficient storage space for /var/lib/pulp/published to double in size before starting the migration process."
+    puts "Check the size of /var/lib/pulp/published with 'du -sh /var/lib/pulp/published/'"
+  end
+end

data/lib/katello/tasks/reports.rake

@@ -1,7 +1,4 @@
 load "#{Rails.root}/lib/tasks/reports.rake"
 
 #Katello reports can generate a foreman task, so mark the task as a dynflow client
-["reports:daily", "reports:weekly", "reports:monthly"].each do |task|
-  Rake::Task[task].clear
-  Rake::Task[task].enhance ["dynflow:client"]
-end
+["reports:daily", "reports:weekly", "reports:monthly"].each { |task| Rake::Task[task].enhance ["dynflow:client"] }

data/lib/katello/tasks/reset.rake

@@ -27,7 +27,8 @@ namespace :katello do
       system("sudo systemctl stop 'pulpcore-worker@*' --all")
       system("sudo runuser - postgres -c 'dropdb pulpcore'")
       system("sudo runuser - postgres -c 'createdb pulpcore'")
-      Dir.chdir('/usr/lib/python3.6/site-packages/pulpcore') do
+
+      Dir.chdir("/tmp") do
         fail "\e[31mCannot migrate Pulp3 database\e[0m\n\n" unless system("sudo -u pulp PULP_SETTINGS='/etc/pulp/settings.py' DJANGO_SETTINGS_MODULE='pulpcore.app.settings' python3-django-admin migrate --no-input")
         puts "\e[33mRecreating Admin User\e[0m\n\n"
         system("sudo -u pulp PULP_SETTINGS='/etc/pulp/settings.py' DJANGO_SETTINGS_MODULE='pulpcore.app.settings' python3-django-admin reset-admin-password --password password")

data/lib/katello/tasks/upgrades/3.18/add_cvv_export_history_metadata.rb

@@ -0,0 +1,18 @@
+namespace :katello do
+  namespace :upgrades do
+    namespace '3.18' do
+      task :add_cvv_export_history_metadata => ['environment', 'check_ping'] do
+        smart_proxy = SmartProxy.pulp_primary!
+
+        Katello::ContentViewVersionExportHistory.includes(:content_view_version).where(metadata: nil).find_each do |export_history|
+          export = ::Katello::Pulp3::ContentViewVersion::Export.new(
+            content_view_version: export_history.content_view_version,
+            smart_proxy: smart_proxy
+          )
+
+          export_history.update(metadata: export.generate_metadata)
+        end
+      end
+    end
+  end
+end

data/lib/katello/version.rb

@@ -1,3 +1,3 @@
 module Katello
-  VERSION = "3.17.3".freeze
+  VERSION = "3.18.0.rc1".freeze
 end

data/locale/action_names.rb

@@ -1,70 +1,77 @@
 # Autogenerated!
-_("Index module streams")
-_("Index package groups")
+_("Import")
+_("Export")
+_("Update")
+_("Enable")
+_("Verify checksum")
 _("Upload into")
-_("Index content")
-_("Fetch pxe files")
+_("Upload errata into")
+_("Update redhat repository")
+_("Update content urls")
+_("Update http proxy details")
+_("Index package groups")
+_("Instance update")
+_("Index errata")
+_("Filtered index content")
 _("Discover")
 _("Errata mail")
-_("Delete")
 _("Delete Package Group")
 _("Create")
-_("Delete Product")
+_("Delete")
 _("Reindex subscriptions")
-_("Product Create")
+_("Delete Product")
 _("Destroy")
-_("Combined Profile Update")
+_("Updating System Purpose for host")
+_("Update for host")
 _("Update release version for host")
 _("Remove subscriptions")
-_("Update Content Overrides")
-_("Install package")
+_("Remove package group")
 _("Update package")
-_("Install package group")
-_("Install Applicable Errata")
-_("Attach subscriptions")
-_("Update")
-_("Auto attach subscriptions")
-_("Destroy Content Host")
-_("Install erratum")
+_("Install package")
 _("Hypervisors")
-_("Hypervisors update")
-_("Remove package")
-_("Remove package group")
-_("Update for host")
-_("Package Profile Update")
-_("Abstract async task")
-_("Update http proxy")
-_("Export")
-_("Filtered index content")
-_("Index errata")
-_("Instance update")
-_("Import facts")
-_("Import Puppet classes")
-_("Action with sub plans")
-_("Remove Content")
-_("Synchronize")
-_("Update content urls")
-_("Update http proxy details")
-_("Update redhat repository")
-_("Upload errata into")
-_("Create Package Group")
-_("Disable")
-_("Enable")
-_("Run Sync Plan:")
+_("Install erratum")
+_("Destroy Content Host")
+_("Attach subscriptions")
+_("Incremental Update")
 _("Publish Lifecycle Environment Repositories")
 _("Delete Lifecycle Environment")
-_("Incremental Update")
-_("Republish Version Repositories")
-_("Remove Version")
+_("Import Content View Version")
 _("Remove from Environment")
-_("Remove Versions and Associations")
-_("Promotion to Environment")
 _("Publish")
+_("Promotion to Environment")
 _("Promote")
 _("Incremental Update of  Content View Version(s) ")
 _("Sync capsule")
 _("Synchronize smart proxy")
-_("Generate repository applicability")
 _("Bulk generate applicability for hosts")
 _("Generate host applicability")
 _("Delete Activation Key")
+_("Import facts")
+_("Action with sub plans")
+_("Import Puppet classes")
+_("Abstract async task")
+_("Generate repository applicability")
+_("Remove Versions and Associations")
+_("Remove Version")
+_("Republish Version Repositories")
+_("Auto attach subscriptions")
+_("Install Applicable Errata")
+_("Hypervisors update")
+_("Remove package")
+_("Install package group")
+_("Update Content Overrides")
+_("Package Profile Update")
+_("Combined Profile Update")
+_("Product Create")
+_("Update http proxy")
+_("Fetch pxe files")
+_("Index content")
+_("Index module streams")
+_("Remove Content")
+_("Synchronize")
+_("Create Package Group")
+_("Disable")
+_("Run Sync Plan:")
+_("Copy version units to library")
+_("Remote action:")
+_("Report")