plugin.rb in katello-4.10.0.rc1

- old
+ new

@@ -240,11 +240,10 @@
   logger :action, :enabled => true
   logger :manifest_import_logger, :enabled => true
   logger :registry_proxy, :enabled => true
   logger :katello_events, :enabled => true
   logger :candlepin_events, :enabled => true
-  logger :agent, :enabled => true
 
   widget 'errata_widget', :name => 'Latest Errata', :sizey => 1, :sizex => 6
   widget 'content_views_widget', :name => 'Content Views', :sizey => 1, :sizex => 6
   widget 'sync_widget', :name => 'Sync Overview', :sizey => 1, :sizex => 6
   widget 'subscription_widget', :name => 'Host Subscription Status', :sizey => 1, :sizex => 6
@@ -455,22 +454,10 @@
         type: :integer,
         default: 60 * 20,
         full_name: N_('Timeout when refreshing a manifest (in seconds)'),
         description: N_("Manifest refresh timeout")
 
-      setting 'content_action_accept_timeout',
-        type: :integer,
-        default: 20,
-        full_name: N_('Accept action timeout'),
-        description: N_("Time in seconds to wait for a host to pick up a katello-agent action")
-
-      setting 'content_action_finish_timeout',
-        type: :integer,
-        default: 3600,
-        full_name: N_('Finish action timeout'),
-        description: N_("Time in seconds to wait for a host to finish a katello-agent action")
-
       setting 'subscription_connection_enabled',
         type: :boolean,
         default: true,
         full_name: N_('Subscription connection enabled'),
         description: N_("Can communicate with the Red Hat Portal for subscriptions.")
@@ -573,16 +560,10 @@
         type: :integer,
         default: 3600,
         full_name: N_('Sync Sock Read Timeout'),
         description: N_("The maximum number of seconds that Pulp can take to download a file, not counting connection time.")
 
-      setting 'remote_execution_by_default',
-        type: :boolean,
-        default: false,
-        full_name: N_('Use remote execution by default'),
-        description: N_("If this is enabled, remote execution is used instead of katello-agent for remote actions")
-
       setting 'unregister_delete_host',
         type: :boolean,
         default: false,
         full_name: N_('Delete Host upon unregister'),
         description: N_("When unregistering a host via subscription-manager, also delete the host record. Managed resources linked to host such as virtual machines and DNS records may also be deleted.")
@@ -609,15 +590,9 @@
       setting 'expire_soon_days',
         type: :integer,
         default: 120,
         full_name: N_('Expire soon days'),
         description: N_('The number of days remaining in a subscription before you will be reminded about renewing it.')
-
-      setting 'content_view_solve_dependencies',
-        type: :boolean,
-        default: false,
-        full_name: N_('content view Dependency Solving Default'),
-        description: N_('The default dependency solving value for new content views.')
 
       setting 'host_dmi_uuid_duplicates',
         type: :array,
         default: [],
         full_name: N_('Host Duplicate DMI UUIDs'),