katello 4.4.0.rc1 → 4.4.0.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 2cffead633d7427ab354f070ad520ef1436914690ae62a83707bd51f0ff94156
-  data.tar.gz: 759afa6d6768f23db062327899cd38db646b99c59d5068027dcf4bdc74f47896
+  metadata.gz: 2b7c14fb8d3608a0596bbe874028ed8966b14c2d530e8f22dd33253e678e7f7b
+  data.tar.gz: 4d762d2ac2cbe0c7362b52901c4fdf671421aae11fe9c3fdf6146b8729221895
 SHA512:
-  metadata.gz: f4d6669e6c29532fe48cb70fd014bc0fb0fd9e7ddfb29a3832e175134be2ecb40b2dbcedd458cef5303805680e28ec3d17a3ea9f250a3482403490c7dd22b3d1
-  data.tar.gz: 458b225423b94a7cfb95034ee9bbff4d0fceca0effcf2dfd2651bb98bf535cadc681791ccbbaca19175cd17446fffab9b1190140f07973e8b220c28239aaf398
+  metadata.gz: 63470c8748cb2f52087d0e6afb152b3e1d7ac7b0985f755ea662189acf807945fba766f6def46417995b665a914adfcf62d5041bb2ea1381c03031a07d34ac34
+  data.tar.gz: 39dfbe4fe023dd34b8f371b2df102ffe8a9318c7f8ee0e67aa37b371c06ac171a8ab73fe6359ca17209209c73e7d083caf91e301b9e3ff040bb68069d48103c0

data/app/controllers/katello/api/v2/content_views_controller.rb

@@ -53,6 +53,7 @@ module Katello
     param :composite, :bool, :desc => N_("Filter only composite content views")
     param :without, Array, :desc => N_("Do not include this array of content views")
     param :name, String, :desc => N_("Name of the content view"), :required => false
+    param :label, String, :desc => N_("Label of the content view"), :required => false
     param_group :search, Api::V2::ApiController
     add_scoped_search_description_for(ContentView)
     def index
@@ -69,6 +70,7 @@ module Katello
       content_views = ::Foreman::Cast.to_bool(params[:noncomposite]) ? content_views.non_composite : content_views.composite if params[:noncomposite]
       content_views = ::Foreman::Cast.to_bool(params[:composite]) ? content_views.composite : content_views.non_composite if params[:composite]
       content_views = content_views.where(:name => params[:name]) if params[:name]
+      content_views = content_views.where(:label => params[:label]) if params[:label]
       content_views = content_views.where("#{ContentView.table_name}.id NOT IN (?)", params[:without]) if params[:without]
       content_views
     end

data/app/controllers/katello/api/v2/environments_controller.rb

@@ -48,6 +48,7 @@ module Katello
     param :organization_id, :number, :desc => N_("organization identifier")
     param :library, [true, false], :desc => N_("set true if you want to see only library environments")
     param :name, String, :desc => N_("filter only environments containing this name")
+    param :label, String, :desc => N_("filter only environments containing this label"), :required => false
     param_group :search, Api::V2::ApiController
     add_scoped_search_description_for(KTEnvironment)
     def index
@@ -58,6 +59,7 @@ module Katello
       query = KTEnvironment.readable
       query = query.where(organization: @organization) if @organization
       query = query.where(:name => params[:name]) if params[:name]
+      query = query.where(:label => params[:label]) if params[:label]
       query = query.where(:library => params[:library]) if params[:library]
       query
     end

data/app/controllers/katello/api/v2/repositories_bulk_actions_controller.rb

@@ -53,7 +53,16 @@ module Katello
     api :POST, "/repositories/bulk/reclaim_space", N_("Reclaim space from On Demand repositories")
     param :ids, Array, :desc => N_("List of repository ids"), :required => true
     def reclaim_space_from_repositories
-      task = async_task(::Actions::Pulp3::Repository::ReclaimSpace, @repositories)
+      if @repositories.empty?
+        fail _("No repositories selected.")
+      end
+      repositories = @repositories.select { |repo| repo.download_policy == ::Katello::RootRepository::DOWNLOAD_ON_DEMAND }
+      if repositories.empty?
+        fail _("Only On Demand repositories may have space reclaimed.")
+      end
+      task = async_task(::Actions::BulkAction,
+                        ::Actions::Pulp3::Repository::ReclaimSpace,
+                        repositories)
 
       respond_for_async :resource => task
     end

data/app/controllers/katello/api/v2/repositories_controller.rb

@@ -327,6 +327,9 @@ module Katello
     api :POST, "/repositories/:id/reclaim_space", N_("Reclaim space from an On Demand repository")
     param :id, :number, :required => true, :desc => N_("repository ID")
     def reclaim_space
+      if @repository.download_policy != ::Katello::RootRepository::DOWNLOAD_ON_DEMAND
+        fail HttpErrors::BadRequest, _("Only On Demand repositories may have space reclaimed.")
+      end
       task = async_task(::Actions::Pulp3::Repository::ReclaimSpace, @repository)
       respond_for_async :resource => task
     rescue Errors::InvalidActionOptionError => e

data/app/lib/actions/katello/cdn_configuration/update.rb

@@ -4,10 +4,10 @@ module Actions
       class Update < Actions::EntryAction
         def plan(cdn_configuration, options)
           cdn_configuration.update!(options)
-          return if cdn_configuration.airgapped?
 
           if cdn_configuration.upstream_server?
             resource = ::Katello::Resources::CDN::CdnResource.create(cdn_configuration: cdn_configuration)
+            resource.validate!
             keypair = resource.debug_certificate
             cdn_configuration.ssl_cert = OpenSSL::X509::Certificate.new(keypair)
             cdn_configuration.ssl_key = OpenSSL::PKey::RSA.new(keypair)
@@ -20,7 +20,7 @@ module Actions
           roots.each do |root|
             full_path = if cdn_configuration.redhat_cdn?
                           root.product.repo_url(root.library_instance.generate_content_path)
-                        else
+                        elsif cdn_configuration.upstream_server?
                           resource.repository_url(content_label: root.content.label)
                         end
             plan_action(::Actions::Katello::Repository::Update, root, url: full_path)

data/app/lib/actions/katello/repository/errata_mail.rb

@@ -4,17 +4,16 @@ module Actions
       class ErrataMail < Actions::EntryAction
         middleware.use Actions::Middleware::ExecuteIfContentsChanged
 
-        def plan(repo, last_updated = nil, contents_changed = nil)
-          last_updated ||= repo.repository_errata.order('updated_at ASC').last.try(:updated_at) || Time.now
-          plan_self(:repo => repo.id, :last_updated => last_updated.to_s, :contents_changed => contents_changed)
+        def plan(repo, contents_changed = nil)
+          plan_self(:repo => repo.id, :contents_changed => contents_changed)
         end
 
         def run
           ::User.current = ::User.anonymous_admin
-
           repo = ::Katello::Repository.find(input[:repo])
+          last_updated = repo.repository_errata.order('updated_at ASC').last.try(:updated_at) || Time.now
           users = ::User.select { |user| user.receives?(:sync_errata) && user.organization_ids.include?(repo.organization.id) && user.can?(:view_products, repo.product) }.compact
-          errata = ::Katello::Erratum.where(:id => repo.repository_errata.where('katello_repository_errata.updated_at > ?', input[:last_updated].to_datetime).pluck(:erratum_id))
+          errata = ::Katello::Erratum.where(:id => repo.repository_errata.where('katello_repository_errata.updated_at > ?', last_updated).pluck(:erratum_id))
 
           begin
             MailNotification[:sync_errata].deliver(:users => users, :repo => repo, :errata => errata) unless (users.blank? || errata.blank?)

data/app/lib/actions/katello/repository/sync.rb

@@ -51,11 +51,11 @@ module Actions
               plan_action(Katello::Repository::FetchPxeFiles, :id => repo.id)
               plan_action(Katello::Repository::CorrectChecksum, repo)
               concurrence do
-                plan_action(Katello::Repository::ErrataMail, repo, nil, contents_changed)
+                plan_action(Katello::Repository::ErrataMail, repo, output[:contents_changed])
                 plan_action(Actions::Katello::Applicability::Repository::Regenerate, :repo_ids => [repo.id]) if generate_applicability
               end
               plan_self(:id => repo.id, :sync_result => output, :skip_metadata_check => skip_metadata_check, :validate_contents => validate_contents,
-                        :contents_changed => contents_changed)
+                        :contents_changed => output[:contents_changed])
               plan_action(Katello::Repository::SyncHook, :id => repo.id)
             end
           end

data/app/lib/actions/pulp3/abstract.rb

@@ -1,6 +1,6 @@
 module Actions
   module Pulp3
-    class Abstract < Actions::Base
+    class Abstract < Actions::EntryAction
       middleware.use ::Actions::Middleware::RemoteAction
       middleware.use Actions::Middleware::Pulp3ServicesCheck
 

data/app/lib/actions/pulp3/content_view/delete_repository_references.rb

@@ -11,15 +11,25 @@ module Actions
         def invoke_external_task
           tasks = []
           content_view = ::Katello::ContentView.find(input[:content_view_id])
-          content_view.repository_references.each do |repository_reference|
+          to_delete = content_view.repository_references.select do |repository_reference|
             repo = repository_reference.root_repository.library_instance
-            #force pulp3 in case we've done migrations, but haven't switched over yet
-            tasks << repo.backend_service(smart_proxy, true).delete_repository(repository_reference)
+            if delete_href?(repository_reference.repository_href, content_view)
+              #force pulp3 in case we've done migrations, but haven't switched over yet
+              tasks << repo.backend_service(smart_proxy, true).delete_repository(repository_reference)
+              true
+            else
+              false
+            end
           end
-          content_view.repository_references.destroy_all
+          to_delete.each(&:destroy)
 
           output[:pulp_tasks] = tasks
         end
+
+        #migrated composites may have the same RepositoryReference as their component
+        def delete_href?(href, content_view)
+          ::Katello::Pulp3::RepositoryReference.where(:repository_href => href).where.not(:content_view_id => content_view.id).empty?
+        end
       end
     end
   end

data/app/lib/actions/pulp3/content_view_version/create_import_history.rb

@@ -18,8 +18,7 @@ module Actions
             content_view_version_id: input[:content_view_version_id],
             path: input[:path],
             metadata: input[:metadata],
-            audit_comment: ::Katello::ContentViewVersionImportHistory.generate_audit_comment(path: input[:path],
-                                                                                             user: User.current,
+            audit_comment: ::Katello::ContentViewVersionImportHistory.generate_audit_comment(user: User.current,
                                                                                              content_view_name: input[:content_view_name])
           )
           output[:import_history_id] = history.id

data/app/lib/actions/pulp3/repository/reclaim_space.rb

@@ -2,16 +2,9 @@ module Actions
   module Pulp3
     module Repository
       class ReclaimSpace < Pulp3::AbstractAsyncTask
-        def plan(repositories, smart_proxy = SmartProxy.pulp_primary)
-          repositories = [repositories] if repositories.is_a?(::Katello::Repository)
-          if repositories.empty?
-            fail _("No repositories selected.")
-          end
-          repositories = repositories.select { |repo| repo.download_policy == ::Katello::RootRepository::DOWNLOAD_ON_DEMAND }
-          if repositories.empty?
-            fail _("Only On Demand repositories may have space reclaimed.")
-          end
-          repository_hrefs = ::Katello::Pulp3::RepositoryReference.default_cv_repository_hrefs(repositories, Organization.current)
+        def plan(repo, smart_proxy = SmartProxy.pulp_primary)
+          action_subject(repo)
+          repository_hrefs = ::Katello::Pulp3::RepositoryReference.default_cv_repository_hrefs([repo], Organization.current || repositories.first.organization)
           plan_self(repository_hrefs: repository_hrefs, smart_proxy_id: smart_proxy.id)
         end
 

data/app/lib/katello/resources/cdn/katello_cdn.rb

@@ -4,8 +4,8 @@ module Katello
       class KatelloCdn < CdnResource
         def initialize(url, options)
           @organization_label = options.delete(:organization_label)
-          @content_view_label = options.delete(:content_view_label)
-          @lifecycle_environment_label = options.delete(:lifecycle_environment_label)
+          @content_view_label = options.delete(:content_view_label) || ::Katello::OrganizationCreator::DEFAULT_CONTENT_VIEW_LABEL
+          @lifecycle_environment_label = options.delete(:lifecycle_environment_label) || ::Katello::OrganizationCreator::DEFAULT_LIFECYCLE_ENV_LABEL
           fail ArgumentError, "No upstream organization was specified" if @organization_label.nil?
 
           super
@@ -18,16 +18,33 @@ module Katello
 
           fail _("Upstream organization %s does not provide this content path") % @organization_label if repo_set.nil?
 
-          # now get available repositories when we know the upstream repo set ID
-          url = "/katello/api/v2/repository_sets/#{repo_set['id']}/available_repositories?organization_id=#{organization['id']}"
+          params = {
+            full_result: true,
+            organization_id: organization['id'],
+            content_view_id: content_view_id,
+            environment_id: lifecycle_environment_id,
+            search: CGI.escape("content_label = #{repo_set['label']}")
+          }
+          query_params = params.map { |key, value| "#{key}=#{value}" }
+
+          url = "/katello/api/v2/repositories?#{query_params.join("&")}"
           response = get(url)
           json_body = JSON.parse(response)
           results = json_body['results']
 
-          results.map do |r|
+          results.map do |repo|
+            arch = repo['arch']
+            arch = nil if arch == "noarch"
+            substitutions = {
+              :releasever => repo['minor'],
+              :basearch => arch
+            }.compact
+            path = substitutions.inject(content_path) do |path_url, (key, value)|
+              path_url.gsub("$#{key}", value)
+            end
             {
-              path: r['path'],
-              substitutions: r['substitutions']
+              path: path,
+              substitutions: substitutions
             }
           end
         end
@@ -36,12 +53,16 @@ module Katello
           true
         end
 
+        def validate!
+          organization && content_view_id && lifecycle_environment_id
+        end
+
         def debug_certificate
           get("/katello/api/v2/organizations/#{organization['id']}/download_debug_certificate")
         end
 
         def content_view_id
-          rs = get("/katello/api/v2/organizations/#{organization['id']}/content_views?name=#{CGI.escape(@content_view_label)}")
+          rs = get("/katello/api/v2/organizations/#{organization['id']}/content_views?search=#{CGI.escape("label=#{@content_view_label}")}")
           content_view = JSON.parse(rs)['results']&.first
           if content_view.blank?
             fail _("Upstream organization %{org_label} does not have a content view with the label %{cv_label}") % { org_label: @organization_label,
@@ -51,7 +72,7 @@ module Katello
         end
 
         def lifecycle_environment_id
-          rs = get("/katello/api/v2/organizations/#{organization['id']}/environments")
+          rs = get("/katello/api/v2/organizations/#{organization['id']}/environments?full_result=true")
           env = JSON.parse(rs)['results'].find { |lce| lce['label'] == @lifecycle_environment_label }
 
           if env.blank?
@@ -61,7 +82,7 @@ module Katello
           env["id"]
         end
 
-        def repository_url(content_label:)
+        def repository_url(content_label:, arch:, major:, minor:)
           params = {
             search: CGI.escape("content_label = #{content_label}")
           }
@@ -72,17 +93,19 @@ module Katello
           query_params = params.map { |key, value| "#{key}=#{value}" }
           url = "/katello/api/v2/organizations/#{organization['id']}/repositories?#{query_params.join('&')}"
           response = get(url)
-          repository = JSON.parse(response)['results'].first
-
+          repository = JSON.parse(response)['results']&.find { |r| r['arch'] == arch && r['major'] == major && r['minor'] == minor }
           if repository.nil?
             msg_params = { content_label: content_label,
+                           arch: arch,
+                           major: major,
+                           minor: minor,
                            org_label: @organization_label,
                            cv_label: @content_view_label || Katello::OrganizationCreator::DEFAULT_CONTENT_VIEW_LABEL,
                            env_label: @lifecycle_environment_label || Katello::OrganizationCreator::DEFAULT_LIFECYCLE_ENV_LABEL
             }
 
-            fail _("Repository with content label %{content_label} was not found in upstream organization %{org_label},"\
-                   " content view %{cv_label} and lifecycle environment %{env_label} ") % msg_params
+            fail _("Repository with content label: '%{content_label}'#{arch ? ', arch: \'%{arch}\'' : ''}#{minor ? ', version: \'%{minor}\'' : ''} was not found in upstream organization '%{org_label}',"\
+                   " content view '%{cv_label}' and lifecycle environment '%{env_label}'") % msg_params
           end
           repository['full_path']
         end

data/app/lib/katello/util/pulpcore_content_filters.rb

@@ -8,8 +8,9 @@ module Katello
       def filter_package_groups_by_pulp_href(package_groups, package_pulp_hrefs)
         rpms = Katello::Rpm.where(:pulp_id => package_pulp_hrefs)
         package_groups.reject do |package_group|
+          #copy the package group as long as we have 1 package from the group
           package_group.package_names.empty? ||
-          (package_group.package_names - rpms.pluck(:name)).any?
+          (package_group.package_names & rpms.pluck(:name)).empty?
         end
       end
 

data/app/models/katello/candlepin/repository_mapper.rb

@@ -34,7 +34,7 @@ module Katello
           :content_type => katello_content_type,
           :unprotected => unprotected?,
           :download_policy => download_policy,
-          :mirroring_policy => Katello::RootRepository::MIRRORING_POLICY_COMPLETE
+          :mirroring_policy => mirroring_policy
         )
 
         Repository.new(:root => root,
@@ -74,8 +74,9 @@ module Katello
       end
 
       def feed_url
+        return if product.organization.cdn_configuration.airgapped?
         @feed_url ||= if product.cdn_resource&.respond_to?(:repository_url)
-                        product.cdn_resource.repository_url(content_label: content.label)
+                        product.cdn_resource.repository_url(content_label: content.label, arch: arch, major: version[:major], minor: version[:minor])
                       else
                         product.repo_url(path)
                       end
@@ -136,6 +137,14 @@ module Katello
           ""
         end
       end
+
+      def mirroring_policy
+        if katello_content_type == Repository::YUM_TYPE
+          Katello::RootRepository::MIRRORING_POLICY_COMPLETE
+        else
+          Katello::RootRepository::MIRRORING_POLICY_CONTENT
+        end
+      end
     end
   end
 end

data/app/models/katello/cdn_configuration.rb

@@ -53,6 +53,8 @@ module Katello
       self.ssl_ca_credential_id = nil
       self.upstream_content_view_label = nil
       self.upstream_lifecycle_environment_label = nil
+      self.ssl_cert = nil
+      self.ssl_key = nil
     end
 
     def non_redhat_configuration

data/app/models/katello/concerns/audit_comment_extensions.rb

@@ -0,0 +1,17 @@
+module Katello
+  module Concerns::AuditCommentExtensions
+    extend ActiveSupport::Concern
+
+    module ClassMethods
+      # to prevent PG::StringDataRightTruncation: ERROR:  value too long for type character varying(255)
+      def truncate_audit_comment(long_comment)
+        if long_comment.length > 255
+          Rails.logger.info "Truncating audit comment: #{long_comment}"
+          "#{long_comment[0..250]}..."
+        else
+          long_comment
+        end
+      end
+    end
+  end
+end

data/app/models/katello/concerns/host_managed_extensions.rb

@@ -401,10 +401,20 @@ module Katello
       end
 
       def package_names_for_job_template(action:, search:)
-        actions = ['install']
+        actions = %w(install remove update).freeze
         case action
         when 'install'
           ::Katello::Rpm.yum_installable_for_host(self).search_for(search).distinct.pluck(:name)
+        when 'remove'
+          return [] if search.empty?
+
+          installed_packages.search_for(search).distinct.pluck(:name)
+        when 'update'
+          return [] if search.empty?
+
+          pkg_names = installed_packages.search_for(search).distinct.pluck(:name)
+          upgrades = ::Katello::Rpm.installable_for_hosts([self]).select(:id, :name, :nvra, :evr).order(evr: :desc).group_by(&:name)
+          pkg_names.map { |p| upgrades[p]&.first&.nvra }.compact
         else
           fail ::Foreman::Exception.new(N_("package_names_for_job_template: Action must be one of %s"), actions.join(', '))
         end

data/app/models/katello/concerns/smart_proxy_extensions.rb

@@ -179,6 +179,7 @@ module Katello
           config.scheme = uri.scheme
           pulp3_ssl_configuration(config)
           config.debugging = false
+          config.timeout = SETTINGS[:katello][:rest_client_timeout]
           config.logger = ::Foreman::Logging.logger('katello/pulp_rest')
           config.username = self.setting(PULP3_FEATURE, 'username')
           config.password = self.setting(PULP3_FEATURE, 'password')

data/app/models/katello/content_view_version_export_history.rb

@@ -1,6 +1,7 @@
 module Katello
   class ContentViewVersionExportHistory < Katello::Model
     include Authorization::ContentViewVersionExportHistory
+    include Concerns::AuditCommentExtensions
     audited except: :metadata
     delegate :organization, to: :content_view_version
     delegate :id, to: :organization, prefix: true
@@ -58,7 +59,7 @@ module Katello
         export_descriptor = "export of content view '#{content_view_version.content_view.name}' version #{content_view_version.version}"
         export_descriptor += " from #{from_version.name}" if from_version
       end
-      "#{export_type&.capitalize} #{export_descriptor} created by #{user.to_label}"
+      truncate_audit_comment("#{export_type&.capitalize} #{export_descriptor} created by #{user.to_label}")
     end
   end
 end

data/app/models/katello/content_view_version_import_history.rb

@@ -1,6 +1,7 @@
 module Katello
   class ContentViewVersionImportHistory < Katello::Model
     include Authorization::ContentViewVersionImportHistory
+    include Concerns::AuditCommentExtensions
 
     audited except: :metadata
     delegate :organization, to: :content_view_version
@@ -31,12 +32,11 @@ module Katello
     scoped_search :on => :id, :only_explicit => true, :validator => ScopedSearch::Validators::INTEGER
     scoped_search :on => :import_type, :rename => :type, :complete_value => ContentViewVersionExportHistory::EXPORT_TYPES
 
-    def self.generate_audit_comment(user:, path:, content_view_name:)
-      _("Content imported from %{path} into content view '%{name}' by %{user}") % {
-        path: path,
+    def self.generate_audit_comment(user:, content_view_name:)
+      truncate_audit_comment(_("Content imported by %{user} into content view '%{name}'") % {
         user: user.to_label,
         name: content_view_name
-      }
+      })
     end
   end
 end

data/app/models/katello/host_available_module_stream.rb

@@ -37,6 +37,16 @@ module Katello
                                              :stream => available_module_stream.stream}).exists?
     end
 
+    def install_status
+      return 'Not installed' if installed_profiles.blank?
+      case status
+      when 'disabled'
+        'Installed'
+      when 'enabled'
+        upgradable? ? 'Upgradable' : 'Up-to-date'
+      end
+    end
+
     def self.upgradable(host)
       upgradable_module_name_streams = ModuleStream.installable_for_hosts([host]).select(:name, :stream)
 

data/app/models/katello/installed_package.rb

@@ -15,6 +15,7 @@ module Katello
     has_many :host_installed_packages, :class_name => "Katello::HostInstalledPackage", :dependent => :destroy, :inverse_of => :installed_package
     has_many :hosts, :through => :host_installed_packages, :class_name => "::Host"
 
+    scoped_search :on => :id, :complete_value => true
     scoped_search :on => :name, :complete_value => true
     scoped_search :on => :nvrea
     scoped_search :on => :nvra

data/app/models/katello/kt_environment.rb

@@ -75,6 +75,7 @@ module Katello
     ERROR_CLASS_NAME = "Environment".freeze
 
     scoped_search :on => :name, :complete_value => true
+    scoped_search :on => :label, :complete_value => true
     scoped_search :on => :organization_id, :complete_value => true, :only_explicit => true, :validator => ScopedSearch::Validators::INTEGER
     scoped_search :on => :id, :complete_value => true, :only_explicit => true, :validator => ScopedSearch::Validators::INTEGER
 

data/app/models/katello/root_repository.rb

@@ -62,7 +62,8 @@ module Katello
     validates_lengths_from_database :except => [:label]
     validates_with Validators::KatelloLabelFormatValidator, :attributes => :label
     validates_with Validators::KatelloNameFormatValidator, :attributes => :name
-    validates_with Validators::KatelloUrlFormatValidator, :attributes => :url, :nil_allowed => proc { |repo| repo.custom? },
+    validates_with Validators::KatelloUrlFormatValidator, :attributes => :url,
+                   :nil_allowed => proc { |repo| repo.custom? || repo.organization.cdn_configuration.airgapped? },
                    :field_name => :url
     validates_with Validators::RootRepositoryUniqueAttributeValidator, :attributes => :name
     validates_with Validators::RootRepositoryUniqueAttributeValidator, :attributes => :label
@@ -83,6 +84,7 @@ module Katello
     validate :ensure_valid_deb_constraints, :if => :deb?
     validate :ensure_no_checksum_on_demand
     validate :ensure_valid_mirroring_policy
+    validate :ensure_valid_retain_package_versions_count
     validates :checksum_type, :inclusion => {:in => CHECKSUM_TYPES}, :allow_blank => true
     validates :product_id, :presence => true
     validates :content_type, :inclusion => {
@@ -306,6 +308,16 @@ module Katello
       end
     end
 
+    def ensure_valid_retain_package_versions_count
+      return unless self.retain_package_versions_count
+      unless yum?
+        errors.add(:retain_package_versions_count, N_("is only allowed for Yum repositories."))
+      end
+      if self.retain_package_versions_count.to_i < 0
+        errors.add(:retain_package_versions_count, N_("must not be a negative value."))
+      end
+    end
+
     def custom_content_path
       parts = []
       # We generate repo path only for custom product content. We add this
@@ -372,7 +384,7 @@ module Katello
 
     def pulp_update_needed?
       changeable_attributes = %w(url unprotected checksum_type docker_upstream_name download_policy mirroring_policy verify_ssl_on_sync
-                                 upstream_username upstream_password ignorable_content
+                                 upstream_username upstream_password ignorable_content retain_package_versions_count
                                  ssl_ca_cert_id ssl_client_cert_id ssl_client_key_id http_proxy_policy http_proxy_id download_concurrency)
       changeable_attributes += %w(name container_repository_name include_tags exclude_tags) if docker?
       changeable_attributes += %w(deb_releases deb_components deb_architectures gpg_key_id) if deb?

data/app/models/setting/content.rb

@@ -105,8 +105,15 @@ class Setting::Content < Setting
                "/etc/pki/katello/private/pulp-client.key", N_('Pulp client key')),
       self.set('pulp_client_cert', N_("Path for ssl cert used for pulp server auth"),
                "/etc/pki/katello/certs/pulp-client.crt", N_('Pulp client cert')),
-      self.set('sync_connect_timeout', N_("Total timeout in seconds for connections when syncing"),
-               300, N_('Sync Connection Timeout')),
+      self.set('sync_total_timeout', N_("The maximum number of second that Pulp can take to do a single sync operation, e.g., download a single metadata file."),
+               3600, N_('Sync Total Timeout')),
+      self.set('sync_connect_timeout_v2',
+               N_("The maximum number of seconds for Pulp to establish a new connection or for waiting for a free connection from a pool if pool connection limits are exceeded."),
+               60, N_('Sync Connect Timeout')),
+      self.set('sync_sock_connect_timeout', N_("The maximum number of seconds for Pulp to connect to a peer for a new connection not given from a pool."),
+               60, N_('Sync Sock Connect Timeout')),
+      self.set('sync_sock_read_timeout', N_("The maximum number of seconds that Pulp can take to download a file, not counting connection time."),
+               3600, N_('Sync Sock Read Timeout')),
       self.set('remote_execution_by_default', N_("If this is enabled, remote execution is used instead of katello-agent for remote actions"),
                false, N_('Use remote execution by default')),
       self.set('unregister_delete_host', N_("When unregistering a host via subscription-manager, also delete the host record. Managed resources linked to host " \

data/app/services/katello/organization_creator.rb

@@ -133,11 +133,15 @@ module Katello
     end
 
     def create_cdn_configuration
-      @cdn_configuration = Katello::CdnConfiguration.where(
-        organization: @organization,
-        url: ::Katello::Resources::CDN::CdnResource.redhat_cdn_url,
-        type: ::Katello::CdnConfiguration::CDN_TYPE
-      ).first_or_create!
+      @cdn_configuration = Katello::CdnConfiguration.where(organization: @organization)
+
+      if @cdn_configuration.blank?
+        Katello::CdnConfiguration.where(
+          organization: @organization,
+          url: ::Katello::Resources::CDN::CdnResource.redhat_cdn_url,
+          type: ::Katello::CdnConfiguration::CDN_TYPE
+        ).first_or_create!
+      end
     end
   end
 end

data/app/services/katello/pulp3/api/yum.rb

@@ -36,6 +36,10 @@ module Katello
           PulpRpmClient::ContentPackageenvironmentsApi.new(api_client)
         end
 
+        def content_modulemd_defaults_api
+          PulpRpmClient::ContentModulemdDefaultsApi.new(api_client)
+        end
+
         def content_repo_metadata_files_api
           PulpRpmClient::ContentRepoMetadataFilesApi.new(api_client)
         end