diff options
author | Tim Smith <tsmith84@gmail.com> | 2020-02-28 18:38:33 -0800 |
---|---|---|
committer | Tim Smith <tsmith84@gmail.com> | 2020-02-28 18:38:33 -0800 |
commit | 378b9b5aa393f8cb40d860e20b8c0b0c885afc78 (patch) | |
tree | 7ed1170ff68f030894551f36b4a74d9250e89cce /lib | |
parent | 7fa565737fb3cc984ad686266bbe3fec30312510 (diff) | |
download | chef-378b9b5aa393f8cb40d860e20b8c0b0c885afc78.tar.gz |
Remove the mixin powershell includes from resourcespowershell_include
This is in universal so we don't need to do it in these resources /
providers. We had it in some, but not in others.
Signed-off-by: Tim Smith <tsmith@chef.io>
Diffstat (limited to 'lib')
-rw-r--r-- | lib/chef/provider/package/chocolatey.rb | 2 | ||||
-rw-r--r-- | lib/chef/provider/windows_task.rb | 2 | ||||
-rw-r--r-- | lib/chef/resource/windows_ad_join.rb | 3 | ||||
-rw-r--r-- | lib/chef/resource/windows_feature_powershell.rb | 3 |
4 files changed, 0 insertions, 10 deletions
diff --git a/lib/chef/provider/package/chocolatey.rb b/lib/chef/provider/package/chocolatey.rb index fe90650846..32b1c9e256 100644 --- a/lib/chef/provider/package/chocolatey.rb +++ b/lib/chef/provider/package/chocolatey.rb @@ -17,13 +17,11 @@ require_relative "../package" require_relative "../../resource/chocolatey_package" -require_relative "../../mixin/powershell_out" class Chef class Provider class Package class Chocolatey < Chef::Provider::Package - include Chef::Mixin::PowershellOut provides :chocolatey_package diff --git a/lib/chef/provider/windows_task.rb b/lib/chef/provider/windows_task.rb index 90e0f3e9de..4e16cccc9c 100644 --- a/lib/chef/provider/windows_task.rb +++ b/lib/chef/provider/windows_task.rb @@ -19,7 +19,6 @@ require_relative "../mixin/shell_out" require "rexml/document" unless defined?(REXML::Document) require "iso8601" if ChefUtils.windows? -require_relative "../mixin/powershell_out" require_relative "../provider" require_relative "../util/path_helper" require "win32/taskscheduler" if ChefUtils.windows? @@ -28,7 +27,6 @@ class Chef class Provider class WindowsTask < Chef::Provider include Chef::Mixin::ShellOut - include Chef::Mixin::PowershellOut if ChefUtils.windows? include Win32 diff --git a/lib/chef/resource/windows_ad_join.rb b/lib/chef/resource/windows_ad_join.rb index b807abaa93..84f7fa00fb 100644 --- a/lib/chef/resource/windows_ad_join.rb +++ b/lib/chef/resource/windows_ad_join.rb @@ -16,7 +16,6 @@ # require_relative "../resource" -require_relative "../mixin/powershell_out" require_relative "../dist" class Chef @@ -25,8 +24,6 @@ class Chef resource_name :windows_ad_join provides :windows_ad_join - include Chef::Mixin::PowershellOut - description "Use the windows_ad_join resource to join a Windows Active Directory domain." introduced "14.0" diff --git a/lib/chef/resource/windows_feature_powershell.rb b/lib/chef/resource/windows_feature_powershell.rb index 8f9abb002b..067b8c5332 100644 --- a/lib/chef/resource/windows_feature_powershell.rb +++ b/lib/chef/resource/windows_feature_powershell.rb @@ -16,7 +16,6 @@ # limitations under the License. # -require_relative "../mixin/powershell_out" require_relative "../json_compat" require_relative "../resource" require_relative "../platform/query_helpers" @@ -59,8 +58,6 @@ class Chef x.map(&:downcase) end - include Chef::Mixin::PowershellOut - action :install do reload_cached_powershell_data unless node["powershell_features_cache"] fail_if_unavailable # fail if the features don't exist |