diff options
| author | Claire McQuin <mcquin@users.noreply.github.com> | 2014-08-07 16:20:45 -0700 |
|---|---|---|
| committer | Claire McQuin <mcquin@users.noreply.github.com> | 2014-08-07 16:20:45 -0700 |
| commit | c684b497296e49f706458e8d6bd211fc100c3e71 (patch) | |
| tree | c36970136140f45eb116f0307fb7245a35a8d6db /lib/chef/platform/provider_mapping.rb | |
| parent | d9dd57ac5f7c6e7c3ae0f82d9b598a82aaf1a0d7 (diff) | |
| parent | 6290f4b25e0ccf28ad738a536aba8d15ea4fd11c (diff) | |
| download | chef-c684b497296e49f706458e8d6bd211fc100c3e71.tar.gz | |
Merge pull request #1527 from opscode/ryancragun/OC-11667
[OC-11667] Don't overwrite the :default provider map if :default is passed as the platform
Diffstat (limited to 'lib/chef/platform/provider_mapping.rb')
| -rw-r--r-- | lib/chef/platform/provider_mapping.rb | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/lib/chef/platform/provider_mapping.rb b/lib/chef/platform/provider_mapping.rb index 43003ecef3..86be1c5527 100644 --- a/lib/chef/platform/provider_mapping.rb +++ b/lib/chef/platform/provider_mapping.rb @@ -524,6 +524,8 @@ class Chef if platforms.has_key?(args[:platform]) if platforms[args[:platform]].has_key?(:default) platforms[args[:platform]][:default][args[:resource].to_sym] = args[:provider] + elsif args[:platform] == :default + platforms[:default][args[:resource].to_sym] = args[:provider] else platforms[args[:platform]] = { :default => { args[:resource].to_sym => args[:provider] } } end |