summaryrefslogtreecommitdiff
path: root/lib/chef/provider/dsc_resource.rb
diff options
context:
space:
mode:
authorJay Mundrawala <jdmundrawala@gmail.com>2015-12-03 21:34:29 -0800
committerJay Mundrawala <jdmundrawala@gmail.com>2015-12-03 21:40:16 -0800
commit2c8d90c0eea2b014aba1699c677d9d42c850746b (patch)
tree0c5abdfa453d9aaf6d1a7734fc89b055229f8b4f /lib/chef/provider/dsc_resource.rb
parent3c18cd94ec153b73441ef3e3f4bd3c82a7f24587 (diff)
downloadchef-2c8d90c0eea2b014aba1699c677d9d42c850746b.tar.gz
Add timeout attribute to dsc_resourcejdm/dsc_resource_timeout
`dsc_resource` was missing a timeout resource. Some resources, such as `xSQLServerSetup` were taking longer than the default of 10 minuites set by mixlib-shellout. Fixes #4232
Diffstat (limited to 'lib/chef/provider/dsc_resource.rb')
-rw-r--r--lib/chef/provider/dsc_resource.rb2
1 files changed, 1 insertions, 1 deletions
diff --git a/lib/chef/provider/dsc_resource.rb b/lib/chef/provider/dsc_resource.rb
index efbe4eccef..fd25a14ea5 100644
--- a/lib/chef/provider/dsc_resource.rb
+++ b/lib/chef/provider/dsc_resource.rb
@@ -154,7 +154,7 @@ class Chef
"Invoke-DscResource #{switches}",
output_format
)
- cmdlet.run!
+ cmdlet.run!({}, {:timeout => new_resource.timeout})
end
def return_dsc_resource_result(result, property_name)