katello 4.5.1 → 4.6.0.rc1

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

@@ -2068,6 +2068,10 @@ msgstr ""
 msgid "Docker Repositories"
 msgstr ""
 
+#: app/assets/javascripts/bastion_katello/environments/views/environments.html
+msgid "Docker Repositories <div>{{ library.counts.docker_repositories || 0 }}</div>"
+msgstr ""
+
 #: app/assets/javascripts/bastion_katello/content-views/details/views/content-view-docker-repositories.html
 msgid "Docker Repository Selection"
 msgstr ""
@@ -3983,10 +3987,6 @@ msgstr ""
 msgid "Publish New Version"
 msgstr ""
 
-#: app/assets/javascripts/bastion_katello/products/details/repositories/details/views/repository-info.html
-msgid "Publish via HTTPS"
-msgstr ""
-
 #: app/assets/javascripts/bastion_katello/content-views/details/content-view-versions.controller.js
 msgid "Published"
 msgstr ""
@@ -5924,7 +5924,6 @@ msgstr ""
 #: app/assets/javascripts/bastion_katello/environments/details/views/environment-content-views.html
 #: app/assets/javascripts/bastion_katello/products/bulk/views/products-bulk-http-proxy-modal.html
 #: app/assets/javascripts/bastion_katello/products/bulk/views/products-bulk-sync-plan-modal.html
-#: app/assets/javascripts/bastion_katello/products/details/repositories/details/views/repository-info.html
 #: app/assets/javascripts/bastion_katello/activation-keys/details/activation-key-details.controller.js
 #: app/assets/javascripts/bastion_katello/content-hosts/details/content-host-details.controller.js
 msgid "Yes"

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

@@ -25,7 +25,6 @@ module BastionKatello
           activation_keys
           content_credentials
           content_hosts
-          legacy
           debs
           docker_tags
           files

data/lib/katello/engine.rb

@@ -40,8 +40,7 @@ module Katello
           :skip_checksum_validation => false,
           :upload_chunk_size => 1_048_575, # upload size in bytes to pulp. see SSLRenegBufferSize in apache
           :sync_threads => 4,
-          :sync_KBlimit => nil,
-          :notifier_ca_path => "/etc/pki/tls/certs/ca-bundle.crt"
+          :sync_KBlimit => nil
         },
         :candlepin => {
           :url => 'https://localhost:8443/candlepin',

data/lib/katello/permission_creator.rb

@@ -350,8 +350,8 @@ module Katello
                          :resource_type => 'Katello::Subscription'
       @plugin.permission :manage_subscription_allocations,
                          {
-                           'katello/api/v2/upstream_subscriptions' => [:index, :create, :destroy, :update, :ping, :enable_simple_content_access, :disable_simple_content_access, :simple_content_access_eligible],
-                           'katello/api/v2/simple_content_access' => [:enable, :disable, :eligible]
+                           'katello/api/v2/upstream_subscriptions' => [:index, :create, :destroy, :update, :ping, :enable_simple_content_access, :disable_simple_content_access, :simple_content_access_eligible, :simple_content_access_status],
+                           'katello/api/v2/simple_content_access' => [:enable, :disable, :eligible, :status]
                          },
                          :resource_type => 'Katello::Subscription'
     end

data/lib/katello/permissions/host_permissions.rb

@@ -52,6 +52,7 @@ Foreman::AccessControl.permission(:view_hosts).actions.concat [
   'katello/api/v2/host_subscriptions/index',
   'katello/api/v2/host_subscriptions/events',
   'katello/api/v2/host_subscriptions/product_content',
+  'katello/api/v2/host_subscriptions/enabled_repositories',
   'katello/api/v2/hosts_bulk_actions/applicable_errata',
   'katello/api/v2/hosts_bulk_actions/installable_errata',
   'katello/api/v2/hosts_bulk_actions/available_incremental_updates',

data/lib/katello/plugin.rb

@@ -517,18 +517,6 @@ Foreman::Plugin.register :katello do
         full_name: N_('Pulp 3 export destination filepath'),
         description: N_("On-disk location for pulp 3 exported repositories")
 
-      setting 'pulp_client_key',
-        type: :string,
-        default: "/etc/pki/katello/private/pulp-client.key",
-        full_name: N_('Pulp client key'),
-        description: N_("Path for ssl key used for pulp server auth")
-
-      setting 'pulp_client_cert',
-        type: :string,
-        default: "/etc/pki/katello/certs/pulp-client.crt",
-        full_name: N_('Pulp client cert'),
-        description: N_("Path for ssl cert used for pulp server auth")
-
       setting 'sync_total_timeout',
         type: :integer,
         default: 3600,
@@ -673,6 +661,12 @@ Foreman::Plugin.register :katello do
         default: true,
         full_name: N_('Allow deleting repositories in published content views'),
         description: N_("If this is enabled, repositories can be deleted even when they belong to published content views. The deleted repository will be removed from all content view versions.")
+
+      setting 'distribute_archived_cvv',
+        type: :boolean,
+        default: true,
+        full_name: N_('Distribute archived content view versions'),
+        description: N_("If this is enabled, repositories of content view versions without environments (\"archived\") will be distributed at '/pulp/content/<organization>/content_views/<content view>/X.Y/...'.")
     end
   end
 

data/lib/katello/version.rb

@@ -1,3 +1,3 @@
 module Katello
-  VERSION = "4.5.1".freeze
+  VERSION = "4.6.0.rc1".freeze
 end

data/locale/action_names.rb

@@ -1,17 +1,59 @@
 # Autogenerated!
+_("Action with sub plans")
+_("Import facts")
+_("Import Puppet classes")
+_("Abstract async task")
+_("Create")
+_("Delete Activation Key")
+_("Update")
+_("Agent action")
+_("Create Alternate Content Source")
+_("Destroy Alternate Content Source")
+_("Refresh Alternate Content Source")
+_("Update Alternate Content Source")
+_("Errata mail")
+_("Incremental Update of  Content View Version(s) ")
+_("Generate host applicability")
+_("Bulk generate applicability for hosts")
+_("Generate repository applicability")
+_("Synchronize smart proxy")
+_("Sync capsule")
+_("Update CDN Configuration")
+_("Delete")
+_("Promote")
+_("Promotion to Environment")
+_("Publish")
+_("Remove Versions and Associations")
+_("Remove from Environment")
+_("Remove Version")
+_("Export")
+_("Import Content View Version")
+_("Import Default Content View")
+_("Import Repository")
+_("Incremental Update")
+_("Republish Version Repositories")
+_("Delete Lifecycle Environment")
+_("Publish Lifecycle Environment Repositories")
+_("Attach subscriptions")
+_("Auto attach subscriptions")
+_("Destroy Content Host")
+_("Install Applicable Errata")
+_("Hypervisors")
+_("Hypervisors update")
+_("Remove subscriptions")
+_("Update Content Overrides")
+_("Update for host")
+_("Update release version for host")
+_("Updating System Purpose for host")
 _("Package Profile Update")
 _("Combined Profile Update")
 _("Destroy")
 _("Product Create")
 _("Delete Product")
 _("Reindex subscriptions")
-_("Update")
 _("Update http proxy")
-_("Delete")
-_("Create")
 _("Delete Package Group")
 _("Discover")
-_("Errata mail")
 _("Fetch pxe files")
 _("Filtered index content")
 _("Upload into")
@@ -30,52 +72,13 @@ _("Verify checksum")
 _("Disable")
 _("Enable")
 _("Run Sync Plan:")
+_("Abstract")
 _("Create Export History")
 _("Create Import History")
+_("Create Syncable Export History")
 _("Copy version units to library")
-_("Export")
 _("Export Library")
 _("Export Repository")
 _("Import")
-_("Abstract")
+_("Syncable export")
 _("Remote action:")
-_("Updating System Purpose for host")
-_("Update release version for host")
-_("Update for host")
-_("Update Content Overrides")
-_("Remove subscriptions")
-_("Import Default Content View")
-_("Import Content View Version")
-_("Remove Version")
-_("Hypervisors update")
-_("Hypervisors")
-_("Install Applicable Errata")
-_("Destroy Content Host")
-_("Auto attach subscriptions")
-_("Attach subscriptions")
-_("Publish Lifecycle Environment Repositories")
-_("Delete Lifecycle Environment")
-_("Republish Version Repositories")
-_("Incremental Update")
-_("Import Repository")
-_("Remove from Environment")
-_("Remove Versions and Associations")
-_("Publish")
-_("Promotion to Environment")
-_("Promote")
-_("Incremental Update of  Content View Version(s) ")
-_("Update CDN Configuration")
-_("Sync capsule")
-_("Synchronize smart proxy")
-_("Generate repository applicability")
-_("Bulk generate applicability for hosts")
-_("Generate host applicability")
-_("Update Alternate Content Source")
-_("Destroy Alternate Content Source")
-_("Create Alternate Content Source")
-_("Agent action")
-_("Delete Activation Key")
-_("Abstract async task")
-_("Import Puppet classes")
-_("Import facts")
-_("Action with sub plans")