summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorTim Smith <tsmith84@gmail.com>2020-04-24 14:10:52 -0700
committerTim Smith <tsmith84@gmail.com>2020-04-24 14:13:51 -0700
commitae08a572850f247655674c8a9329566c815ca1d7 (patch)
tree871c395cda3dd9b34dc53fab594ae4997069d3ff
parent47b9da0494e48a3695295b69435e0a346056a187 (diff)
downloadchef-ae08a572850f247655674c8a9329566c815ca1d7.tar.gz
Add back shell_out with the actual 900s default
Signed-off-by: Tim Smith <tsmith@chef.io>
-rw-r--r--lib/chef/resource/service.rb5
1 files changed, 5 insertions, 0 deletions
diff --git a/lib/chef/resource/service.rb b/lib/chef/resource/service.rb
index b28ba365b2..2a55973500 100644
--- a/lib/chef/resource/service.rb
+++ b/lib/chef/resource/service.rb
@@ -114,6 +114,11 @@ class Chef
property :priority, [ Integer, String, Hash ],
description: "Debian platform only. The relative priority of the program for start and shutdown ordering. May be an integer or a Hash. An integer is used to define the start run levels; stop run levels are then 100-integer. A Hash is used to define values for specific run levels. For example, { 2 => [:start, 20], 3 => [:stop, 55] } will set a priority of twenty for run level two and a priority of fifty-five for run level three."
+ property :timeout, Integer,
+ description: "The amount of time (in seconds) to wait before timing out.",
+ default: 900,
+ desired_state: false
+
property :parameters, Hash,
description: "Upstart only: A hash of parameters to pass to the service command for use in the service definition."