diff options
Diffstat (limited to 'lib/chef/platform')
| -rw-r--r-- | lib/chef/platform/provider_mapping.rb | 17 | ||||
| -rw-r--r-- | lib/chef/platform/query_helpers.rb | 7 |
2 files changed, 14 insertions, 10 deletions
diff --git a/lib/chef/platform/provider_mapping.rb b/lib/chef/platform/provider_mapping.rb index ed3306e0ac..e10b51e921 100644 --- a/lib/chef/platform/provider_mapping.rb +++ b/lib/chef/platform/provider_mapping.rb @@ -57,7 +57,6 @@ class Chef :freebsd => { :default => { :group => Chef::Provider::Group::Pw, - :package => Chef::Provider::Package::Freebsd, :service => Chef::Provider::Service::Freebsd, :user => Chef::Provider::User::Pw, :cron => Chef::Provider::Cron @@ -65,18 +64,19 @@ class Chef }, :ubuntu => { :default => { - :package => Chef::Provider::Package::Apt, :service => Chef::Provider::Service::Debian, :cron => Chef::Provider::Cron, :mdadm => Chef::Provider::Mdadm }, ">= 11.10" => { :ifconfig => Chef::Provider::Ifconfig::Debian + }, + ">= 13.10" => { + :service => Chef::Provider::Service::Upstart, } }, :gcel => { :default => { - :package => Chef::Provider::Package::Apt, :service => Chef::Provider::Service::Debian, :cron => Chef::Provider::Cron, :mdadm => Chef::Provider::Mdadm @@ -84,7 +84,6 @@ class Chef }, :linaro => { :default => { - :package => Chef::Provider::Package::Apt, :service => Chef::Provider::Service::Debian, :cron => Chef::Provider::Cron, :mdadm => Chef::Provider::Mdadm @@ -92,7 +91,6 @@ class Chef }, :raspbian => { :default => { - :package => Chef::Provider::Package::Apt, :service => Chef::Provider::Service::Debian, :cron => Chef::Provider::Cron, :mdadm => Chef::Provider::Mdadm @@ -100,7 +98,6 @@ class Chef }, :linuxmint => { :default => { - :package => Chef::Provider::Package::Apt, :service => Chef::Provider::Service::Upstart, :cron => Chef::Provider::Cron, :mdadm => Chef::Provider::Mdadm @@ -108,7 +105,6 @@ class Chef }, :debian => { :default => { - :package => Chef::Provider::Package::Apt, :service => Chef::Provider::Service::Debian, :cron => Chef::Provider::Cron, :mdadm => Chef::Provider::Mdadm @@ -277,6 +273,7 @@ class Chef :solaris => {}, :openindiana => { :default => { + :mount => Chef::Provider::Mount::Solaris, :service => Chef::Provider::Service::Solaris, :package => Chef::Provider::Package::Ips, :cron => Chef::Provider::Cron::Solaris, @@ -285,6 +282,7 @@ class Chef }, :opensolaris => { :default => { + :mount => Chef::Provider::Mount::Solaris, :service => Chef::Provider::Service::Solaris, :package => Chef::Provider::Package::Ips, :cron => Chef::Provider::Cron::Solaris, @@ -293,6 +291,7 @@ class Chef }, :nexentacore => { :default => { + :mount => Chef::Provider::Mount::Solaris, :service => Chef::Provider::Service::Solaris, :package => Chef::Provider::Package::Solaris, :cron => Chef::Provider::Cron::Solaris, @@ -301,6 +300,7 @@ class Chef }, :omnios => { :default => { + :mount => Chef::Provider::Mount::Solaris, :service => Chef::Provider::Service::Solaris, :package => Chef::Provider::Package::Ips, :cron => Chef::Provider::Cron::Solaris, @@ -310,6 +310,7 @@ class Chef }, :solaris2 => { :default => { + :mount => Chef::Provider::Mount::Solaris, :service => Chef::Provider::Service::Solaris, :package => Chef::Provider::Package::Ips, :cron => Chef::Provider::Cron::Solaris, @@ -317,6 +318,7 @@ class Chef :user => Chef::Provider::User::Solaris, }, "< 5.11" => { + :mount => Chef::Provider::Mount::Solaris, :service => Chef::Provider::Service::Solaris, :package => Chef::Provider::Package::Solaris, :cron => Chef::Provider::Cron::Solaris, @@ -326,6 +328,7 @@ class Chef }, :smartos => { :default => { + :mount => Chef::Provider::Mount::Solaris, :service => Chef::Provider::Service::Solaris, :package => Chef::Provider::Package::SmartOS, :cron => Chef::Provider::Cron::Solaris, diff --git a/lib/chef/platform/query_helpers.rb b/lib/chef/platform/query_helpers.rb index f9f7af0343..f6f5309de5 100644 --- a/lib/chef/platform/query_helpers.rb +++ b/lib/chef/platform/query_helpers.rb @@ -30,15 +30,16 @@ class Chef def windows_server_2003? return false unless windows? - require 'ruby-wmi' + require 'wmi-lite/wmi' # CHEF-4888: Work around ruby #2618, expected to be fixed in Ruby 2.1.0 # https://github.com/ruby/ruby/commit/588504b20f5cc880ad51827b93e571e32446e5db # https://github.com/ruby/ruby/commit/27ed294c7134c0de582007af3c915a635a6506cd WIN32OLE.ole_initialize - host = WMI::Win32_OperatingSystem.find(:first) - is_server_2003 = (host.version && host.version.start_with?("5.2")) + wmi = WmiLite::Wmi.new + host = wmi.first_of('Win32_OperatingSystem') + is_server_2003 = (host['version'] && host['version'].start_with?("5.2")) WIN32OLE.ole_uninitialize |