diff options
| author | sersut <serdar@opscode.com> | 2014-03-20 00:44:56 -0700 |
|---|---|---|
| committer | sersut <serdar@opscode.com> | 2014-03-20 00:44:56 -0700 |
| commit | 47bae6531723a2b2e82605714e705bfbb9df74f7 (patch) | |
| tree | f303a6dead5f1d3b496c00827b9159bee570a2ba | |
| parent | 9c3841f286a0bef949df1baf7f1d14d0460b9253 (diff) | |
| download | chef-47bae6531723a2b2e82605714e705bfbb9df74f7.tar.gz | |
Remove Usermod group provider from Suse after fixing OHAI-339.
| -rw-r--r-- | CHANGELOG.md | 3 | ||||
| -rw-r--r-- | lib/chef/platform/provider_mapping.rb | 14 |
2 files changed, 3 insertions, 14 deletions
diff --git a/CHANGELOG.md b/CHANGELOG.md index f3ba5d85eb..366e74c94c 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -48,7 +48,8 @@ * Don't destructively merge subhashes in hash_only_merge!. (CHEF-4918) * Display correct host name in knife ssh error message (CHEF-5029) * Knife::UI#confirm now has a default_choice option. (CHEF-5057) -* Add knife 'ssl check' and 'ssl fetch' commands for debugging SSL errors (CHEF-4711) +* Add knife 'ssl check' and 'ssl fetch' commands for debugging SSL errors. (CHEF-4711) +* Usermod group provider is only used on OpenSuse. (OHAI-339) ## Last Release: 11.10.0 (02/06/2014) diff --git a/lib/chef/platform/provider_mapping.rb b/lib/chef/platform/provider_mapping.rb index 73a873f591..2f934faa3e 100644 --- a/lib/chef/platform/provider_mapping.rb +++ b/lib/chef/platform/provider_mapping.rb @@ -180,6 +180,7 @@ class Chef :package => Chef::Provider::Package::Zypper, :group => Chef::Provider::Group::Suse }, + # Only OpenSuSE 12.3+ should use the Usermod group provider: ">= 12.3" => { :group => Chef::Provider::Group::Usermod } @@ -190,19 +191,6 @@ class Chef :cron => Chef::Provider::Cron, :package => Chef::Provider::Package::Zypper, :group => Chef::Provider::Group::Suse - }, - ############################################### - # TODO: Remove this after ohai update is released. - # Only OpenSuSE 12.3+ should use the Usermod group provider: - # Ohai before OHAI-339 is applied reports both OpenSuSE and SuSE - # Enterprise as "suse", Ohai after OHAI-339 will report OpenSuSE as - # "opensuse". - # - # In order to support OpenSuSE both before and after the Ohai - # change, I'm leaving this here. It needs to get removed before - # SuSE enterprise 12.3 ships. - ">= 12.3" => { - :group => Chef::Provider::Group::Usermod } }, :oracle => { |