diff options
author | Jay Mundrawala <jdmundrawala@gmail.com> | 2014-09-10 11:19:17 -0700 |
---|---|---|
committer | Jay Mundrawala <jdmundrawala@gmail.com> | 2014-09-22 15:55:51 -0700 |
commit | b16b6157be731425f922b911d8810e9996c6887a (patch) | |
tree | cc5a93e47b374f0101b2ef757a877a253b7b1360 /lib/chef/resource | |
parent | ed907ef4d64027212ceb0c082895b303844ff43f (diff) | |
download | chef-b16b6157be731425f922b911d8810e9996c6887a.tar.gz |
We now check for powershell/dsc compat in provider.jdmundrawala/issue-2027-master
The problem with raising an exception when the resource is created
was that it was not possible to have a chef recipe that installs
the correct version of powershell and then runs the dsc_script
resource.
See https://github.com/opscode/chef/issues/2027
Diffstat (limited to 'lib/chef/resource')
-rw-r--r-- | lib/chef/resource/dsc_script.rb | 18 |
1 files changed, 2 insertions, 16 deletions
diff --git a/lib/chef/resource/dsc_script.rb b/lib/chef/resource/dsc_script.rb index 2972ace1aa..76ac6659d6 100644 --- a/lib/chef/resource/dsc_script.rb +++ b/lib/chef/resource/dsc_script.rb @@ -28,12 +28,8 @@ class Chef super @allowed_actions.push(:run) @action = :run - if(run_context && Chef::Platform.supports_dsc?(run_context.node)) - @provider = Chef::Provider::DscScript - else - raise Chef::Exceptions::NoProviderAvailable, - "#{powershell_info_str(run_context)}\nPowershell 4.0 or higher was not detected on your system and is required to use the dsc_script resource." - end + @provider = Chef::Provider::DscScript + @resource_name = :dsc_script end def code(arg=nil) @@ -125,16 +121,6 @@ class Chef :kind_of => [ Integer ] ) end - - private - - def powershell_info_str(run_context) - if run_context && run_context.node[:languages] && run_context.node[:languages][:powershell] - install_info = "Powershell #{run_context.node[:languages][:powershell][:version]} was found on the system." - else - install_info = 'Powershell was not found.' - end - end end end end |