app/models/setting/katello.rb in katello-2.2.2 vs app/models/setting/katello.rb in katello-2.4.0.rc1

- old
+ new

@@ -11,10 +11,11 @@ self.set('katello_default_iPXE', N_("Default iPXE template for new Operating Systems"), 'Kickstart default iPXE'), self.set('katello_default_ptable', N_("Default partitioning table for new Operating Systems"), 'Kickstart default'), self.set('content_action_accept_timeout', N_("Time in seconds to wait for a Host to pickup a remote action"), 20), self.set('content_action_finish_timeout', N_("Time in seconds to wait for a Host to finish a remote action"), 3600), self.set('pulp_sync_node_action_accept_timeout', N_("Time in seconds to wait for a pulp node to remote action"), 20), - self.set('pulp_sync_node_action_finish_timeout', N_("Time in seconds to wait for a pulp node to finish sync"), 12.hours.to_i) + self.set('pulp_sync_node_action_finish_timeout', N_("Time in seconds to wait for a pulp node to finish sync"), 12.hours.to_i), + self.set('check_services_before_actions', N_("Whether or not to check the status of backend services such as pulp and candlepin prior to performing some actions."), true) ].each { |s| self.create! s.update(:category => "Setting::Katello") } end true end end