katello 4.13.0 → 4.14.0.rc1

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

@@ -34,8 +34,8 @@ module BastionKatello
         :config_generator =>  lambda do
           { 'consumerCertRPM' => consumer_cert_rpm,
             'defaultDownloadPolicy' => !Foreman.in_rake? && db_migrated && Setting['default_download_policy'],
-            'remoteExecutionPresent' => ::Katello.with_remote_execution?,
-            'hostToolingEnabled' => ::Katello.with_remote_execution?
+            'remoteExecutionPresent' => true,
+            'hostToolingEnabled' => true
           }
         end
       )

data/lib/katello/engine.rb

@@ -202,9 +202,7 @@ module Katello
 
       ::AuditSearch::ClassMethods.prepend Katello::Concerns::AuditSearch
 
-      if ::Katello.with_remote_execution?
-        ::RemoteExecutionProxySelector.prepend Katello::Concerns::RemoteExecutionProxySelectorExtensions
-      end
+      ::RemoteExecutionProxySelector.prepend Katello::Concerns::RemoteExecutionProxySelectorExtensions
 
       load 'katello/repository_types.rb'
       load 'katello/scheduled_jobs.rb'
@@ -223,11 +221,6 @@ module Katello
     end
   end
 
-  # check whether foreman_remote_execution to integrate is available in the system
-  def self.with_remote_execution?
-    Foreman::Plugin.installed?("foreman_remote_execution")
-  end
-
   def self.with_ansible?
     Foreman::Plugin.installed?("foreman_ansible")
   end

data/lib/katello/permission_creator.rb

@@ -62,7 +62,8 @@ module Katello
       @plugin.permission :view_capsule_content,
                          {
                            'katello/api/v2/capsule_content' => [:counts, :lifecycle_environments, :available_lifecycle_environments, :sync_status],
-                           'smart_proxies' => [:pulp_storage, :pulp_status, :show_with_content]
+                           'smart_proxies' => [:pulp_storage, :pulp_status, :show_with_content],
+                           'katello/api/v2/capsules' => [:index, :show]
                          },
                          :resource_type => "SmartProxy"
     end
@@ -243,7 +244,7 @@ module Katello
                            'katello/products' => [:auto_complete, :auto_complete_search],
                            'katello/api/v2/products' => [:index, :show, :auto_complete_search],
                            'katello/api/v2/repositories' => [:index, :show, :repository_types, :content_types, :auto_complete_search, :cancel],
-                           'katello/api/v2/packages' => [:index, :show, :auto_complete_search, :auto_complete_name, :auto_complete_arch, :compare],
+                           'katello/api/v2/packages' => [:index, :thindex, :show, :auto_complete_search, :auto_complete_name, :auto_complete_arch, :compare],
                            'katello/api/v2/srpms' => [:index, :show, :auto_complete_search, :compare],
                            'katello/api/v2/debs' => [:index, :show, :auto_complete_search, :auto_complete_name, :auto_complete_arch, :compare],
                            'katello/api/v2/package_groups' => [:index, :show, :auto_complete_search, :compare],

data/lib/katello/plugin.rb

@@ -363,7 +363,7 @@ Foreman::Plugin.register :katello do
         type: :boolean,
         default: false,
         full_name: N_('Allow multiple content views'),
-        description: N_("Allow a host to be registered to multiple content view environments with 'subscription-manager register --environments'.") # TODO: update this description when AKs support this setting as well
+        description: N_("Allow a host to be assigned to multiple content view environments with 'subscription-manager register --environments' or 'subscription-manager environments --set'.") # TODO: update this description when AKs support this setting as well
 
       setting 'content_default_http_proxy',
         type: :string,
@@ -459,7 +459,7 @@ Foreman::Plugin.register :katello do
         type: :boolean,
         default: false,
         full_name: N_('Generate errata status from directly-installable content'),
-        description: N_("If true, only errata that can be installed without an incremental update will affect the host's errata status.")
+        description: N_("If true, only errata that can be installed without an incremental update will affect the host's errata status. Also affects the Host Collections dashboard widget.")
 
       setting 'restrict_composite_view',
         type: :boolean,
@@ -643,8 +643,8 @@ Foreman::Plugin.register :katello do
       setting 'remote_execution_prefer_registered_through_proxy',
         type: :boolean,
         default: false,
-        full_name: N_('Prefer registered through proxy for remote execution'),
-        description: N_('Prefer using a proxy to which a host is registered when using remote execution')
+        full_name: N_('Prefer registered through Smart Proxy for remote execution'),
+        description: N_('Prefer using a Smart Proxy to which a host is registered when using remote execution')
 
       setting 'delete_repo_across_cv',
         type: :boolean,
@@ -663,32 +663,36 @@ Foreman::Plugin.register :katello do
         default: true,
         full_name: N_('Calculate content counts on smart proxies automatically'),
         description: N_("If this is enabled, content counts on smart proxies will be updated automatically after content sync.")
+
+      setting 'hide_reclaim_space_warning',
+        type: :boolean,
+        default: false,
+        full_name: N_('Hide Reclaim Space Warning'),
+        description: N_('If this is enabled, the Smart Proxy page will suppress the warning message about reclaiming space.')
     end
   end
 
-  if Katello.with_remote_execution?
-    RemoteExecutionFeature.register(:katello_package_install, N_("Katello: Install Package"), :description => N_("Install package via Katello interface"), :provided_inputs => ['package'])
-    RemoteExecutionFeature.register(:katello_package_install_by_search, N_("Katello: Install packages by search query"), :description => N_("Install packages via Katello interface"), :provided_inputs => ['Package search query'])
-    RemoteExecutionFeature.register(:katello_package_update, N_("Katello: Update Package"), :description => N_("Update package via Katello interface"), :provided_inputs => ['package'])
-    RemoteExecutionFeature.register(:katello_packages_update_by_search, N_("Katello: Update Packages by search query"), :description => N_("Update packages via Katello interface"), :provided_inputs => ['Package search query'])
-    RemoteExecutionFeature.register(:katello_package_remove, N_("Katello: Remove Package"), :description => N_("Remove package via Katello interface"), :provided_inputs => ['package'])
-    RemoteExecutionFeature.register(:katello_packages_remove_by_search, N_("Katello: Remove Packages by search query"), :description => N_("Remove packages via Katello interface"), :provided_inputs => ['Package search query'])
-    RemoteExecutionFeature.register(:katello_group_install, N_("Katello: Install Package Group"), :description => N_("Install package group via Katello interface"), :provided_inputs => ['package'])
-    RemoteExecutionFeature.register(:katello_group_update, N_("Katello: Update Package Group"), :description => N_("Update package group via Katello interface"), :provided_inputs => ['package'])
-    RemoteExecutionFeature.register(:katello_group_remove, N_("Katello: Remove Package Group"), :description => N_("Remove package group via Katello interface"), :provided_inputs => ['package'])
-    RemoteExecutionFeature.register(:katello_errata_install, N_("Katello: Install Errata"), :description => N_("Install errata via Katello interface"), :provided_inputs => ['errata'])
-    RemoteExecutionFeature.register(:katello_errata_install_by_search, N_("Katello: Install errata by search query"), :description => N_("Install errata using scoped search query"), :provided_inputs => ['Errata search query'])
-    RemoteExecutionFeature.register(:katello_service_restart, N_("Katello: Service Restart"), :description => N_("Restart Services via Katello interface"), :provided_inputs => ['helpers'])
-    RemoteExecutionFeature.register(:katello_host_tracer_resolve, N_("Katello: Resolve Traces"), :description => N_("Resolve traces via Katello interface"), :provided_inputs => ['ids'])
-    RemoteExecutionFeature.register(:katello_change_content_source, N_("Katello: Configure host for new content source"), :description => N_("Replace content source on the target machine"), :provided_inputs => [])
-    RemoteExecutionFeature.register(:katello_upload_profile, N_("Katello: Upload Profile"), :description => N_("Upload package / repos profile"), :provided_inputs => [])
-    RemoteExecutionFeature.register(:katello_module_stream_action, N_("Katello: Module Stream Actions"),
-                                    :description => N_("Perform a module stream action via Katello interface"),
-                                    :provided_inputs => ['action', 'module_spec', 'options'])
-    allowed_template_helpers :errata
-
-    RemoteExecutionProvider.singleton_class.prepend(Katello::Concerns::RemoteExecutionProviderExtensions)
-  end
+  RemoteExecutionFeature.register(:katello_package_install, N_("Katello: Install Package"), :description => N_("Install package via Katello interface"), :provided_inputs => ['package'])
+  RemoteExecutionFeature.register(:katello_package_install_by_search, N_("Katello: Install packages by search query"), :description => N_("Install packages via Katello interface"), :provided_inputs => ['Package search query'])
+  RemoteExecutionFeature.register(:katello_package_update, N_("Katello: Update Package"), :description => N_("Update package via Katello interface"), :provided_inputs => ['package'])
+  RemoteExecutionFeature.register(:katello_packages_update_by_search, N_("Katello: Update Packages by search query"), :description => N_("Update packages via Katello interface"), :provided_inputs => ['Package search query'])
+  RemoteExecutionFeature.register(:katello_package_remove, N_("Katello: Remove Package"), :description => N_("Remove package via Katello interface"), :provided_inputs => ['package'])
+  RemoteExecutionFeature.register(:katello_packages_remove_by_search, N_("Katello: Remove Packages by search query"), :description => N_("Remove packages via Katello interface"), :provided_inputs => ['Package search query'])
+  RemoteExecutionFeature.register(:katello_group_install, N_("Katello: Install Package Group"), :description => N_("Install package group via Katello interface"), :provided_inputs => ['package'])
+  RemoteExecutionFeature.register(:katello_group_update, N_("Katello: Update Package Group"), :description => N_("Update package group via Katello interface"), :provided_inputs => ['package'])
+  RemoteExecutionFeature.register(:katello_group_remove, N_("Katello: Remove Package Group"), :description => N_("Remove package group via Katello interface"), :provided_inputs => ['package'])
+  RemoteExecutionFeature.register(:katello_errata_install, N_("Katello: Install Errata"), :description => N_("Install errata via Katello interface"), :provided_inputs => ['errata'])
+  RemoteExecutionFeature.register(:katello_errata_install_by_search, N_("Katello: Install errata by search query"), :description => N_("Install errata using scoped search query"), :provided_inputs => ['Errata search query'])
+  RemoteExecutionFeature.register(:katello_service_restart, N_("Katello: Service Restart"), :description => N_("Restart Services via Katello interface"), :provided_inputs => ['helpers'])
+  RemoteExecutionFeature.register(:katello_host_tracer_resolve, N_("Katello: Resolve Traces"), :description => N_("Resolve traces via Katello interface"), :provided_inputs => ['ids'])
+  RemoteExecutionFeature.register(:katello_change_content_source, N_("Katello: Configure host for new content source"), :description => N_("Replace content source on the target machine"), :provided_inputs => [])
+  RemoteExecutionFeature.register(:katello_upload_profile, N_("Katello: Upload Profile"), :description => N_("Upload package / repos profile"), :provided_inputs => [])
+  RemoteExecutionFeature.register(:katello_module_stream_action, N_("Katello: Module Stream Actions"),
+                                  :description => N_("Perform a module stream action via Katello interface"),
+                                  :provided_inputs => ['action', 'module_spec', 'options'])
+  allowed_template_helpers :errata
+
+  RemoteExecutionProvider.singleton_class.prepend(Katello::Concerns::RemoteExecutionProviderExtensions)
 
   tests_to_skip("AccessPermissionsTest" => [
                   'foreman_tasks/api/tasks/callback should have a permission that grants access',

data/lib/katello/repository_types/docker.rb

@@ -2,6 +2,7 @@ Katello::RepositoryTypeManager.register(::Katello::Repository::DOCKER_TYPE) do
   default_managed_content_type Katello::DockerManifest::CONTENT_TYPE
   pulp3_service_class Katello::Pulp3::Repository::Docker
   pulp3_api_class Katello::Pulp3::Api::Docker
+  repo_discovery_class ::Katello::Resources::Discovery::Container
   pulp3_skip_publication true
   pulp3_plugin 'container'
 

data/lib/katello/repository_types/yum.rb

@@ -1,6 +1,7 @@
 Katello::RepositoryTypeManager.register(::Katello::Repository::YUM_TYPE) do
   pulp3_service_class Katello::Pulp3::Repository::Yum
   pulp3_api_class Katello::Pulp3::Api::Yum
+  repo_discovery_class ::Katello::Resources::Discovery::Yum
   pulp3_plugin 'rpm'
   prevent_unneeded_metadata_publish
 

data/lib/katello/tasks/clean_old_file_repos.rake

@@ -12,10 +12,8 @@ namespace :katello do
         Dir.foreach(dir) do |entry|
           # If directory is a file repo, then it was published using
           # the UUID.  It's a target for deletion.
-          if (repo = Katello::Repository.find_by(pulp_id: File.basename(entry)))
-            if repo.content_type == Katello::Repository::FILE_TYPE
-              delete << "#{dir}#{entry}"
-            end
+          if (repo = Katello::Repository.find_by(pulp_id: File.basename(entry))) && (repo.content_type == Katello::Repository::FILE_TYPE)
+            delete << "#{dir}#{entry}"
           end
         end
       end

data/lib/katello/tasks/reset.rake

@@ -30,10 +30,9 @@ namespace :katello do
       puts "\e[33mStarting Candlepin Reset\e[0m\n\n"
 
       system(service_stop.gsub("%s", 'tomcat'))
-      system("sudo runuser - postgres -c 'dropdb candlepin'")
-      system("sudo runuser - postgres -c 'createdb candlepin'")
-      system("sudo /usr/share/candlepin/cpdb --create --schema-only")
-      system("sudo /usr/share/candlepin/cpdb --update")
+      system("sudo /usr/share/candlepin/cpdb --drop -u postgres")
+      system("sudo /usr/share/candlepin/cpdb --create -u postgres")
+      system("sudo /usr/share/candlepin/cpdb --update-schema")
       system(service_start.gsub("%s", 'tomcat'))
       puts "\e[32mCandlepin Database Reset Complete\e[0m\n\n"
     end

data/lib/katello/version.rb

@@ -1,3 +1,3 @@
 module Katello
-  VERSION = "4.13.0".freeze
+  VERSION = "4.14.0.rc1".freeze
 end

data/lib/katello.rb

@@ -8,20 +8,16 @@ require "gettext_i18n_rails"
 require "foreman-tasks"
 require "foreman_remote_execution"
 require "rest_client"
-require "anemone"
 require "securerandom"
 
 require "deface"
 
-require "securerandom"
-
 # to make Foreman#in_rake? helper available if Foreman's lib is available
 lib_foreman = File.expand_path('lib/foreman', Rails.root)
 require lib_foreman if Dir.exist?(lib_foreman)
 
 require File.expand_path("../engines/bastion/lib/bastion", File.dirname(__FILE__))
 require File.expand_path("../engines/bastion_katello/lib/bastion_katello", File.dirname(__FILE__))
-require "monkeys/anemone"
 
 module Katello
   require "katello/version"

data/lib/monkeys/ar_postgres_evr_t.rb

@@ -9,6 +9,7 @@ if defined? ActiveRecord::ConnectionAdapters::PostgreSQLAdapter
       super
     end
   end
+
   module ActiveRecord
     module ConnectionAdapters
       module PostgreSQL
@@ -16,6 +17,7 @@ if defined? ActiveRecord::ConnectionAdapters::PostgreSQLAdapter
           class EvrT < Type::String; end # :nodoc:
         end
       end
+
       class PostgreSQLAdapter < AbstractAdapter
         prepend PostgreSQLAdapterExtensions
       end

data/locale/action_names.rb

@@ -51,7 +51,7 @@ _("Metadata generate")
 _("Product Create")
 _("Promote")
 _("Promotion to Environment")
-_("Publish Lifecycle Environment Repositories")
+_("Publish Lifecycle Environment Container Repositories")
 _("Publish")
 _("Refresh Alternate Content Source")
 _("Reindex subscriptions")