katello 3.17.0.rc1 → 3.17.0.rc2

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

@@ -4,11 +4,11 @@ module Katello
       include LazyAccessor
 
       def self.content_api
-        PulpRpmClient::ContentModulemdsApi.new(Katello::Pulp3::Api::Yum.new(SmartProxy.pulp_master!).api_client)
+        PulpRpmClient::ContentModulemdsApi.new(Katello::Pulp3::Api::Yum.new(SmartProxy.pulp_primary!).api_client)
       end
 
       def self.ids_for_repository(repo_id)
-        repo = Katello::Pulp3::Repository::Yum.new(Katello::Repository.find(repo_id), SmartProxy.pulp_master)
+        repo = Katello::Pulp3::Repository::Yum.new(Katello::Repository.find(repo_id), SmartProxy.pulp_primary)
         repo_content_list = repo.content_list
         repo_content_list.map { |content| content.try(:pulp_href) }
       end

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

@@ -45,11 +45,11 @@ module Katello
       end
 
       def self.content_api
-        PulpRpmClient::ContentPackagegroupsApi.new(Katello::Pulp3::Api::Yum.new(SmartProxy.pulp_master!).api_client)
+        PulpRpmClient::ContentPackagegroupsApi.new(Katello::Pulp3::Api::Yum.new(SmartProxy.pulp_primary!).api_client)
       end
 
       def self.ids_for_repository(repo_id)
-        repo = Katello::Pulp3::Repository::Yum.new(Katello::Repository.find(repo_id), SmartProxy.pulp_master)
+        repo = Katello::Pulp3::Repository::Yum.new(Katello::Repository.find(repo_id), SmartProxy.pulp_primary)
         repo_content_list = repo.content_list
         repo_content_list.map { |content| content.try(:pulp_href) }
       end

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

@@ -21,7 +21,7 @@ module Katello
       end
 
       def with_mirror_adapter
-        if smart_proxy.pulp_master?
+        if smart_proxy.pulp_primary?
           return self
         else
           return RepositoryMirror.new(self)
@@ -193,16 +193,15 @@ module Katello
         ignore_404_exception { api.repositories_api.delete(href) } if href
       end
 
-      def sync_params
-        {remote: repo.remote_href, mirror: repo.root.mirror_on_sync}
+      def sync(options = {})
+        repository_sync_url_data = api.class.repository_sync_url_class.new(sync_url_params(options))
+        [api.repositories_api.sync(repository_reference.repository_href, repository_sync_url_data)]
       end
 
-      def sync
-        sync_url_params = sync_params
-        skip_type_param = skip_types
-        sync_url_params[:skip_types] = skip_type_param if skip_type_param
-        repository_sync_url_data = api.class.repository_sync_url_class.new(sync_url_params)
-        [api.repositories_api.sync(repository_reference.repository_href, repository_sync_url_data)]
+      def sync_url_params(_sync_options)
+        params = {remote: repo.remote_href, mirror: repo.root.mirror_on_sync}
+        params[:skip_types] = skip_types if skip_types
+        params
       end
 
       def create_publication
@@ -294,6 +293,7 @@ module Katello
           proxy_url: root.http_proxy&.full_url
         }
         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 && root.upstream_password
           remote_options.merge!(username: root.upstream_username,
                                password: root.upstream_password)

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

@@ -11,16 +11,24 @@ module Katello
         def remote_options
           options = {url: root.url, upstream_name: root.docker_upstream_name}
           if root.docker_tags_whitelist&.any?
-            options[:whitelist_tags] = root.docker_tags_whitelist
+            options[:include_tags] = root.docker_tags_whitelist
           else
-            options[:whitelist_tags] = nil
+            options[:include_tags] = nil
           end
           common_remote_options.merge(options)
         end
 
+        def secure_distribution_options(path)
+          #we never need a content guard for docker, and pulp creates one behind the scenes,
+          # so we have to make sure not to try to clear it out
+          options = super
+          options.delete(:content_guard)
+          options
+        end
+
         def mirror_remote_options
           {
-            url: "https://#{SmartProxy.pulp_master.pulp3_host!.downcase}",
+            url: "https://#{SmartProxy.pulp_primary.pulp3_host!.downcase}",
             upstream_name: repo.container_repository_name
           }
         end
@@ -58,20 +66,20 @@ module Katello
 
         def copy_content_for_source(source_repository, options = {})
           filters = ContentViewDockerFilter.where(:id => options[:filter_ids])
-          whitelist_ids = []
-          blacklist_ids = []
+          include_list_ids = []
+          exclude_list_ids = []
           filters.each do |filter|
             if filter.inclusion
-              whitelist_ids += filter.content_unit_pulp_ids(source_repository)
+              include_list_ids += filter.content_unit_pulp_ids(source_repository)
             else
-              blacklist_ids += filter.content_unit_pulp_ids(source_repository)
+              exclude_list_ids += filter.content_unit_pulp_ids(source_repository)
             end
           end
 
-          if whitelist_ids.empty?
-            copy_units_recursively(source_repository.docker_tags.pluck(:pulp_id).sort - blacklist_ids, true)
+          if include_list_ids.empty?
+            copy_units_recursively(source_repository.docker_tags.pluck(:pulp_id).sort - exclude_list_ids, true)
           else
-            copy_units_recursively(whitelist_ids - blacklist_ids, true)
+            copy_units_recursively(include_list_ids - exclude_list_ids, true)
           end
         end
       end

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

@@ -8,11 +8,17 @@ module Katello
         include Katello::Util::PulpcoreContentFilters
 
         def remote_options
-          if root.url.blank?
-            common_remote_options.merge(url: nil, policy: root.download_policy)
-          else
-            common_remote_options.merge(policy: root.download_policy)
-          end
+          url, sles_token = extract_sles_token
+          options = common_remote_options
+          options.merge!(sles_auth_token: sles_token) if sles_token
+          options.merge!(url: url, policy: root.download_policy)
+        end
+
+        def extract_sles_token
+          uri = URI(root.url)
+          query = uri.query
+          uri.query = nil
+          [uri.to_s, query]
         end
 
         def skip_types
@@ -31,10 +37,6 @@ module Katello
           }
         end
 
-        def sync_params
-          {remote: repo.remote_href, mirror: repo.root.mirror_on_sync, optimize: false}
-        end
-
         def mirror_remote_options
           policy = smart_proxy.download_policy
 
@@ -52,7 +54,6 @@ module Katello
               :distribution_version => distribution.results.first.release_version,
               :distribution_arch => distribution.results.first.arch,
               :distribution_family => distribution.results.first.release_name,
-              :distribution_uuid => distribution.results.first.pulp_href,
               :distribution_bootable => self.class.distribution_bootable?(distribution)
             )
             unless distribution.results.first.variants.empty?
@@ -63,6 +64,12 @@ module Katello
           end
         end
 
+        def sync_url_params(sync_options)
+          params = super
+          params[:optimize] = sync_options[:optimize] if sync_options.key?(:optimize)
+          params
+        end
+
         def self.distribution_bootable?(distribution)
           file_paths = distribution.results.first.images.map(&:path)
           file_paths.any? do |path|
@@ -83,7 +90,7 @@ module Katello
             data.config = []
             repo_id_map.each do |source_repo_ids, dest_repo_id_map|
               dest_repo = ::Katello::Repository.find(dest_repo_id_map[:dest_repo])
-              dest_repo_href = ::Katello::Pulp3::Repository::Yum.new(dest_repo, SmartProxy.pulp_master).repository_reference.repository_href
+              dest_repo_href = ::Katello::Pulp3::Repository::Yum.new(dest_repo, SmartProxy.pulp_primary).repository_reference.repository_href
               content_unit_hrefs = dest_repo_id_map[:content_unit_hrefs]
               # Not needed during incremental update due to dest_base_version
               unless dest_repo_id_map[:base_version]
@@ -114,7 +121,7 @@ module Katello
           tasks = []
           repo_id_map.each do |_source_repo_ids, dest_repo_id_map|
             dest_repo = ::Katello::Repository.find(dest_repo_id_map[:dest_repo])
-            dest_repo_href = ::Katello::Pulp3::Repository::Yum.new(dest_repo, SmartProxy.pulp_master).repository_reference.repository_href
+            dest_repo_href = ::Katello::Pulp3::Repository::Yum.new(dest_repo, SmartProxy.pulp_primary).repository_reference.repository_href
             tasks << remove_all_content_from_repo(dest_repo_href)
           end
           tasks
@@ -147,6 +154,11 @@ module Katello
           api.repositories_api.modify(repo_href, data)
         end
 
+        def repair(repository_version_href)
+          data = PulpRpmClient::RepositoryVersion.new
+          api.repository_versions_api.repair(repository_version_href, data)
+        end
+
         def remove_all_content
           data = PulpRpmClient::RepositoryAddRemoveContent.new(
             remove_content_units: ['*'])
@@ -300,7 +312,7 @@ module Katello
         end
 
         def additional_content_hrefs(source_repository, content_unit_hrefs)
-          repo_service = source_repository.backend_service(SmartProxy.pulp_master)
+          repo_service = source_repository.backend_service(SmartProxy.pulp_primary)
           options = { :repository_version => source_repository.version_href }
 
           errata_to_include = filter_errata_by_pulp_href(source_repository.errata, content_unit_hrefs)

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

@@ -119,6 +119,7 @@ module Katello
         remote_options = {
           name: backend_object_name
         }
+        remote_options.merge!({download_concurrency: repo.download_concurrency}) if repo.download_concurrency
         remote_options.merge!(ssl_remote_options)
       end
 
@@ -133,7 +134,7 @@ module Katello
       end
 
       def remote_feed_url
-        uri = ::SmartProxy.pulp_master.pulp3_uri!
+        uri = ::SmartProxy.pulp_primary.pulp3_uri!
         uri.path = repo_service.partial_repo_path
         uri.to_s
       end

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

@@ -11,11 +11,11 @@ module Katello
                     :initializer => :backend_data
 
       def self.content_api
-        PulpRpmClient::ContentPackagesApi.new(Katello::Pulp3::Api::Yum.new(SmartProxy.pulp_master!).api_client)
+        PulpRpmClient::ContentPackagesApi.new(Katello::Pulp3::Api::Yum.new(SmartProxy.pulp_primary!).api_client)
       end
 
       def self.ids_for_repository(repo_id)
-        repo = Katello::Pulp3::Repository::Yum.new(Katello::Repository.find(repo_id), SmartProxy.pulp_master)
+        repo = Katello::Pulp3::Repository::Yum.new(Katello::Repository.find(repo_id), SmartProxy.pulp_primary)
         repo_content_list = repo.content_list
         repo_content_list.map { |content| content.try(:pulp_href) }
       end

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

@@ -2,7 +2,7 @@ module Katello
   module Pulp3
     class SmartProxyMirrorRepository < SmartProxyRepository
       def initialize(smart_proxy)
-        fail "Cannot use a central pulp smart proxy" if smart_proxy.pulp_master?
+        fail "Cannot use a central pulp smart proxy" if smart_proxy.pulp_primary?
         @smart_proxy = smart_proxy
       end
 
@@ -10,7 +10,7 @@ module Katello
         repo_map = {}
 
         smart_proxy_helper = ::Katello::SmartProxyHelper.new(smart_proxy)
-        katello_pulp_ids = smart_proxy_helper.repos_available_to_capsule.map(&:pulp_id)
+        katello_pulp_ids = smart_proxy_helper.combined_repos_available_to_capsule.map(&:pulp_id)
         pulp3_enabled_repo_types.each do |repo_type|
           api = repo_type.pulp3_service_class.api(smart_proxy)
           repo_map[api] = api.list_all.reject { |capsule_repo| katello_pulp_ids.include? capsule_repo.name }

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

@@ -9,7 +9,7 @@ module Katello
       end
 
       def self.instance_for_type(smart_proxy)
-        if smart_proxy.pulp_master?
+        if smart_proxy.pulp_primary?
           SmartProxyRepository.new(smart_proxy)
         else
           SmartProxyMirrorRepository.new(smart_proxy)

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

@@ -14,7 +14,7 @@ module Katello
                     :initializer => :pulp_facts
 
       def self.content_api
-        PulpRpmClient::ContentPackagesApi.new(Katello::Pulp3::Api::Yum.new(SmartProxy.pulp_master!).api_client)
+        PulpRpmClient::ContentPackagesApi.new(Katello::Pulp3::Api::Yum.new(SmartProxy.pulp_primary!).api_client)
       end
 
       def self.page_options(page_opts = {})
@@ -23,7 +23,7 @@ module Katello
       end
 
       def self.ids_for_repository(repo_id)
-        repo = Katello::Pulp3::Repository::Yum.new(Katello::Repository.find(repo_id), SmartProxy.pulp_master)
+        repo = Katello::Pulp3::Repository::Yum.new(Katello::Repository.find(repo_id), SmartProxy.pulp_primary)
         repo_content_list = repo.content_list
         repo_content_list.map { |content| content.try(:pulp_href) }
       end

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

@@ -50,7 +50,7 @@ module Katello
       end
 
       def done?
-        task_group_data['all_tasks_dispatched'] = true && IN_PROGRESS_STATES.all? { |state| task_group_data[state] == 0 }
+        task_group_data['all_tasks_dispatched'] == true && IN_PROGRESS_STATES.all? { |state| task_group_data[state] == 0 }
       end
 
       def poll

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

@@ -4,11 +4,11 @@ module Katello
       include LazyAccessor
 
       def self.content_api
-        PulpRpmClient::ContentRepoMetadataFilesApi.new(Katello::Pulp3::Repository::Yum.api_client(SmartProxy.pulp_master!))
+        PulpRpmClient::ContentRepoMetadataFilesApi.new(Katello::Pulp3::Repository::Yum.api_client(SmartProxy.pulp_primary!))
       end
 
       def self.ids_for_repository(repo_id)
-        repo = Katello::Pulp3::Repository::Yum.new(Katello::Repository.find(repo_id), SmartProxy.pulp_master)
+        repo = Katello::Pulp3::Repository::Yum.new(Katello::Repository.find(repo_id), SmartProxy.pulp_primary)
         repo_content_list = repo.content_list
         repo_content_list.map { |content| content.try(:pulp_href) }
       end

data/app/services/katello/registration_manager.rb

@@ -113,7 +113,7 @@ module Katello
 
         # if this fails, there is not much to do about it right now. We can't really re-create the candlepin consumer.
         # This can be cleaned up later via clean_backend_objects.
-        pulp_consumer_destory(host.content_facet.uuid) if host.content_facet.try(:uuid)
+        pulp_consumer_destory(host.content_facet.uuid) if host.content_facet.try(:uuid) && pulp2_supported?
 
         host.subscription_facet.try(:destroy!)
 
@@ -171,7 +171,9 @@ module Katello
         User.as_anonymous_admin do
           ping_results = Katello::Ping.ping
         end
-        ping_results[:services][:pulp][:status] == "ok" && ping_results[:services][:candlepin][:status] == "ok"
+        candlepin_ok = ping_results[:services][:candlepin][:status] == "ok"
+        pulp_ok = ping_results[:services][:pulp] ? ping_results[:services][:pulp][:status] == "ok" : true
+        candlepin_ok && pulp_ok
       end
 
       private
@@ -183,6 +185,10 @@ module Katello
         Rails.logger.warn("Attempted to destroy host %s but host is already gone." % host_id)
       end
 
+      def pulp2_supported?
+        SmartProxy.pulp_primary.has_feature?(SmartProxy::PULP_FEATURE)
+      end
+
       def get_uuid(params)
         params.key?(:uuid) ? params[:uuid] : SecureRandom.uuid
       end
@@ -203,7 +209,7 @@ module Katello
 
         # if pulp fails, remove the CP consumer we just made
         begin
-          ::Katello.pulp_server.extensions.consumer.create(cp_create[:uuid], display_name: host.name)
+          ::Katello.pulp_server.extensions.consumer.create(cp_create[:uuid], display_name: host.name) if pulp2_supported?
         rescue StandardError => e
           ::Katello::Resources::Candlepin::Consumer.destroy(cp_create[:uuid])
           raise e

data/app/services/katello/repository_type.rb

@@ -33,7 +33,7 @@ module Katello
     end
 
     def content_types_to_index
-      if SmartProxy.pulp_master.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/services/katello/smart_proxy_helper.rb

@@ -10,37 +10,34 @@ module Katello
     end
 
     def default_capsule?
-      @smart_proxy.pulp_master?
+      @smart_proxy.pulp_primary?
     end
 
-    def repos_available_to_capsule(environment = nil, content_view = nil, repository = nil)
-      ret = []
-      if repository
-        environment = repository.environment
-        ret = [repository]
-      else
-        yum_repos = fetch_repos_available_to_capsule(environment, content_view) || []
-        puppet_envs = fetch_puppet_environments_available_to_capsule(environment, content_view) || []
-        ret = yum_repos + puppet_envs
-      end
+    def lifecycle_environment_check(environment = nil, repository = nil)
+      environment = repository.environment if repository
 
       if environment && !self.smart_proxy.lifecycle_environments.include?(environment)
         fail _("Lifecycle environment '%{environment}' is not attached to this capsule.") % { :environment => environment.name }
       end
-
-      ret
     end
 
-    private
+    def combined_repos_available_to_capsule(environment = nil, content_view = nil, repository = nil)
+      lifecycle_environment_check(environment, repository)
+      if repository
+        [repository]
+      else
+        repositories_available_to_capsule(environment, content_view) + puppet_environments_available_to_capsule(environment, content_view)
+      end
+    end
 
-    def fetch_repos_available_to_capsule(environments = nil, content_view = nil)
+    def repositories_available_to_capsule(environments, content_view)
       environments = @smart_proxy.lifecycle_environments if environments.nil?
       yum_repos = Katello::Repository.in_environment(environments)
       yum_repos = yum_repos.in_content_views([content_view]) if content_view
-      yum_repos.select(&:node_syncable?)
+      yum_repos.smart_proxy_syncable
     end
 
-    def fetch_puppet_environments_available_to_capsule(environments = nil, content_view = nil)
+    def puppet_environments_available_to_capsule(environments, content_view)
       environments = @smart_proxy.lifecycle_environments if environments.nil?
       puppet_environments = Katello::ContentViewPuppetEnvironment.in_environment(environments)
       puppet_environments = puppet_environments.in_content_view(content_view) if content_view

data/app/views/foreman/job_templates/install_errata_-_katello_ansible_default.erb

@@ -14,5 +14,13 @@ provider_type: Ansible
 kind: job_template
 %>
 
-<% advisories = input(:errata).split(',').map { |e| "--advisory=#{e}" }.join(' ') %>
-<%= render_template('Run Command - Ansible Default', :command => "yum -y update-minimal #{advisories}") %>
+<% if @host.operatingsystem.family == 'Suse' -%>
+<% advisories = input(:errata).split(',').join(' ') -%>
+<%= render_template('Run Command - Ansible Default', :command => "zypper -n install -t patch #{advisories}") -%>
+<% elsif @host.operatingsystem.family == 'Debian' -%>
+<% advisories = input(:errata).split(',').map { |e| @host.debs_for_erratum(e) }.join(' ') -%>
+<%= render_template('Run Command - Ansible Default', :command => "apt-get -o Dpkg::Options::=\"--force-confdef\" -o Dpkg::Options::=\"--force-confold\" -y --only-upgrade install -y #{advisories}") %>
+<% else -%>
+<% advisories = input(:errata).split(',').map { |e| "--advisory=#{e}" }.join(' ') -%>
+<%= render_template('Run Command - Ansible Default', :command => "yum -y update-minimal #{advisories}") -%>
+<% end -%>

data/app/views/katello/api/v2/content_view_repositories/show_all.json.rabl

@@ -0,0 +1,8 @@
+object false
+
+extends "katello/api/v2/common/metadata"
+
+child @collection[:results] => :results do
+  extends 'katello/api/v2/repositories/base'
+  node(:added_to_content_view) { |repo| repo.in_content_view?(@content_view) }
+end