summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat
-rw-r--r--CHANGELOG.md7
-rw-r--r--Gemfile.lock10
-rw-r--r--VERSION2
-rw-r--r--chef-config/lib/chef-config/version.rb2
-rw-r--r--kitchen-tests/cookbooks/end_to_end/metadata.rb2
-rw-r--r--lib/chef/provider/group/groupadd.rb2
-rw-r--r--lib/chef/provider/group/suse.rb3
-rw-r--r--lib/chef/provider/group/usermod.rb5
-rw-r--r--lib/chef/providers.rb1
-rw-r--r--lib/chef/version.rb2
-rw-r--r--spec/unit/provider/group/usermod_spec.rb2
-rw-r--r--spec/unit/provider_resolver_spec.rb12
12 files changed, 22 insertions, 28 deletions
diff --git a/CHANGELOG.md b/CHANGELOG.md
index 0a46999f38..3dd8dedde3 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,15 +1,16 @@
<!-- usage documentation: http://expeditor-docs.es.chef.io/configuration/changelog/ -->
-<!-- latest_release 15.0.143 -->
-## [v15.0.143](https://github.com/chef/chef/tree/v15.0.143) (2019-01-24)
+<!-- latest_release 15.0.144 -->
+## [v15.0.144](https://github.com/chef/chef/tree/v15.0.144) (2019-01-25)
#### Merged Pull Requests
-- apt_repository: Don&#39;t create gpg temporary files owned by root in the running user&#39;s home directory [#8104](https://github.com/chef/chef/pull/8104) ([vijaymmali1990](https://github.com/vijaymmali1990))
+- Remove support for unsupported opensuse &lt; 42 from group provider [#8158](https://github.com/chef/chef/pull/8158) ([tas50](https://github.com/tas50))
<!-- latest_release -->
<!-- release_rollup -->
### Changes since latest stable release
#### Merged Pull Requests
+- Remove support for unsupported opensuse &lt; 42 from group provider [#8158](https://github.com/chef/chef/pull/8158) ([tas50](https://github.com/tas50)) <!-- 15.0.144 -->
- apt_repository: Don&#39;t create gpg temporary files owned by root in the running user&#39;s home directory [#8104](https://github.com/chef/chef/pull/8104) ([vijaymmali1990](https://github.com/vijaymmali1990)) <!-- 15.0.143 -->
- windows_certificate: Ensure all actions are fully idempotent [#8118](https://github.com/chef/chef/pull/8118) ([Nimesh-Msys](https://github.com/Nimesh-Msys)) <!-- 15.0.142 -->
- Use the latest omnibus-software and nokogiri [#8162](https://github.com/chef/chef/pull/8162) ([tas50](https://github.com/tas50)) <!-- 15.0.141 -->
diff --git a/Gemfile.lock b/Gemfile.lock
index 3f6c86cb40..27d92fac9b 100644
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -27,10 +27,10 @@ GIT
PATH
remote: .
specs:
- chef (15.0.143)
+ chef (15.0.144)
addressable
bundler (>= 1.10)
- chef-config (= 15.0.143)
+ chef-config (= 15.0.144)
chef-zero (>= 14.0.11)
diff-lcs (~> 1.2, >= 1.2.4)
erubis (~> 2.7)
@@ -57,10 +57,10 @@ PATH
specinfra (~> 2.10)
syslog-logger (~> 1.6)
uuidtools (~> 2.1.5)
- chef (15.0.143-universal-mingw32)
+ chef (15.0.144-universal-mingw32)
addressable
bundler (>= 1.10)
- chef-config (= 15.0.143)
+ chef-config (= 15.0.144)
chef-zero (>= 14.0.11)
diff-lcs (~> 1.2, >= 1.2.4)
erubis (~> 2.7)
@@ -104,7 +104,7 @@ PATH
PATH
remote: chef-config
specs:
- chef-config (15.0.143)
+ chef-config (15.0.144)
addressable
fuzzyurl
mixlib-config (>= 2.2.12, < 3.0)
diff --git a/VERSION b/VERSION
index ee27d3e20f..1eb86a57f5 100644
--- a/VERSION
+++ b/VERSION
@@ -1 +1 @@
-15.0.143 \ No newline at end of file
+15.0.144 \ No newline at end of file
diff --git a/chef-config/lib/chef-config/version.rb b/chef-config/lib/chef-config/version.rb
index a9a50952c6..4274ba2ce3 100644
--- a/chef-config/lib/chef-config/version.rb
+++ b/chef-config/lib/chef-config/version.rb
@@ -21,7 +21,7 @@
module ChefConfig
CHEFCONFIG_ROOT = File.expand_path("../..", __FILE__)
- VERSION = "15.0.143".freeze
+ VERSION = "15.0.144".freeze
end
#
diff --git a/kitchen-tests/cookbooks/end_to_end/metadata.rb b/kitchen-tests/cookbooks/end_to_end/metadata.rb
index 83cea5c9a8..9394d16408 100644
--- a/kitchen-tests/cookbooks/end_to_end/metadata.rb
+++ b/kitchen-tests/cookbooks/end_to_end/metadata.rb
@@ -20,7 +20,7 @@ depends "git"
supports "ubuntu"
supports "debian"
supports "centos"
-supports "opensuse"
+supports "opensuseleap"
supports "fedora"
supports "amazon"
diff --git a/lib/chef/provider/group/groupadd.rb b/lib/chef/provider/group/groupadd.rb
index fb8f306034..dd99a1c49a 100644
--- a/lib/chef/provider/group/groupadd.rb
+++ b/lib/chef/provider/group/groupadd.rb
@@ -1,6 +1,6 @@
#
# Author:: AJ Christensen (<aj@chef.io>)
-# Copyright:: Copyright 2008-2016, Chef Software Inc.
+# Copyright:: Copyright 2008-2019, Chef Software Inc.
# License:: Apache License, Version 2.0
#
# Licensed under the Apache License, Version 2.0 (the "License");
diff --git a/lib/chef/provider/group/suse.rb b/lib/chef/provider/group/suse.rb
index 7e8473c901..3f4300278f 100644
--- a/lib/chef/provider/group/suse.rb
+++ b/lib/chef/provider/group/suse.rb
@@ -1,6 +1,6 @@
#
# Author:: AJ Christensen (<aj@chef.io>)
-# Copyright:: Copyright 2008-2016, Chef Software Inc.
+# Copyright:: Copyright 2008-2019, Chef Software Inc.
# License:: Apache License, Version 2.0
#
# Licensed under the Apache License, Version 2.0 (the "License");
@@ -23,7 +23,6 @@ class Chef
class Provider
class Group
class Suse < Chef::Provider::Group::Groupadd
- provides :group, platform: "opensuse", platform_version: "< 12.3"
provides :group, platform: "suse", platform_version: "< 12.0"
def load_current_resource
diff --git a/lib/chef/provider/group/usermod.rb b/lib/chef/provider/group/usermod.rb
index 846c58fbc1..34a563787f 100644
--- a/lib/chef/provider/group/usermod.rb
+++ b/lib/chef/provider/group/usermod.rb
@@ -1,6 +1,6 @@
#
# Author:: AJ Christensen (<aj@chef.io>)
-# Copyright:: Copyright 2008-2016, Chef Software Inc.
+# Copyright:: Copyright 2008-2019, Chef Software Inc.
# License:: Apache License, Version 2.0
#
# Licensed under the Apache License, Version 2.0 (the "License");
@@ -24,7 +24,6 @@ class Chef
class Usermod < Chef::Provider::Group::Groupadd
provides :group, os: %w{openbsd solaris2}
- provides :group, platform: "opensuse"
def load_current_resource
super
@@ -79,7 +78,7 @@ class Chef
case node[:platform]
when "openbsd", "netbsd", "aix", "solaris2", "smartos", "omnios"
"-G"
- when "solaris", "suse", "opensuse"
+ when "solaris"
[ "-a", "-G" ]
end
end
diff --git a/lib/chef/providers.rb b/lib/chef/providers.rb
index ac2462c0ca..b7b0c52e07 100644
--- a/lib/chef/providers.rb
+++ b/lib/chef/providers.rb
@@ -84,6 +84,7 @@ require "chef/provider/package/bff"
require "chef/provider/package/cab"
require "chef/provider/package/powershell"
require "chef/provider/package/msu"
+require "chef/provider/package/snap"
require "chef/provider/service/arch"
require "chef/provider/service/freebsd"
diff --git a/lib/chef/version.rb b/lib/chef/version.rb
index 42f48c8316..285d56207a 100644
--- a/lib/chef/version.rb
+++ b/lib/chef/version.rb
@@ -23,7 +23,7 @@ require "chef/version_string"
class Chef
CHEF_ROOT = File.expand_path("../..", __FILE__)
- VERSION = Chef::VersionString.new("15.0.143")
+ VERSION = Chef::VersionString.new("15.0.144")
end
#
diff --git a/spec/unit/provider/group/usermod_spec.rb b/spec/unit/provider/group/usermod_spec.rb
index e34949f839..3fca15ea8d 100644
--- a/spec/unit/provider/group/usermod_spec.rb
+++ b/spec/unit/provider/group/usermod_spec.rb
@@ -49,8 +49,6 @@ describe Chef::Provider::Group::Usermod do
"openbsd" => [ "-G" ],
"netbsd" => [ "-G" ],
"solaris" => [ "-a", "-G" ],
- "suse" => [ "-a", "-G" ],
- "opensuse" => [ "-a", "-G" ],
"smartos" => [ "-G" ],
"omnios" => [ "-G" ],
}
diff --git a/spec/unit/provider_resolver_spec.rb b/spec/unit/provider_resolver_spec.rb
index 12287daf24..8cef4d4386 100644
--- a/spec/unit/provider_resolver_spec.rb
+++ b/spec/unit/provider_resolver_spec.rb
@@ -670,14 +670,10 @@ describe Chef::ProviderResolver do
group: [ Chef::Resource::Group, Chef::Provider::Group::Suse ],
},
},
- "opensuse" => {
- # service: [ Chef::Resource::RedhatService, Chef::Provider::Service::Redhat ],
- package: [ Chef::Resource::ZypperPackage, Chef::Provider::Package::Zypper ],
- group: [ Chef::Resource::Group, Chef::Provider::Group::Usermod ],
- "12.3" => {
- },
- "12.2" => {
- group: [ Chef::Resource::Group, Chef::Provider::Group::Suse ],
+ "opensuseleap" => {
+ %w{42.3} => {
+ package: [ Chef::Resource::ZypperPackage, Chef::Provider::Package::Zypper ],
+ group: [ Chef::Resource::Group, Chef::Provider::Group::Gpasswd ],
},
},
},
View Lorry Controller Status