diff options
author | Tim Smith <tsmith84@gmail.com> | 2020-10-28 17:26:22 -0700 |
---|---|---|
committer | Tim Smith <tsmith84@gmail.com> | 2020-10-28 17:26:22 -0700 |
commit | 6d24e6a0c44180df372484c5906810e70e41e818 (patch) | |
tree | 7359e18d6c7b4f8eb2521dbc1a0e0d2556dc82ec | |
parent | ef9649e543b6218053fc98208ce884cc81882ce1 (diff) | |
download | chef-6d24e6a0c44180df372484c5906810e70e41e818.tar.gz |
Remove support for nexentacore which has been dead since 2012
https://en.wikipedia.org/wiki/Nexenta_OS
"In late 2011, the Nexenta OS brand was terminated and replaced with Illumian, which is derived from community development for illumos and OpenIndiana, but was distinguished by its use of Debian packaging. Illumian version 1.0 was released in February 2012. Following the initial release of Illumian in 2012, the Illumian project was discontinued.[3]"
and
"Final release 3.1.3.5 (October 31, 2012; 7 years ago)"
We never really support this and it's been dead dead dead for a long time. Just nuke it along with the helpers. There's no way anyone used these.
Signed-off-by: Tim Smith <tsmith@chef.io>
-rw-r--r-- | chef-utils/README.md | 4 | ||||
-rw-r--r-- | chef-utils/lib/chef-utils/dsl/platform.rb | 13 | ||||
-rw-r--r-- | chef-utils/lib/chef-utils/dsl/platform_family.rb | 2 | ||||
-rw-r--r-- | cspell.json | 2 | ||||
-rw-r--r-- | lib/chef/provider/package/solaris.rb | 1 | ||||
-rw-r--r-- | lib/chef/resource/solaris_package.rb | 1 | ||||
-rw-r--r-- | spec/unit/provider_resolver_spec.rb | 6 | ||||
-rw-r--r-- | spec/unit/resource/solaris_package_spec.rb | 18 |
8 files changed, 11 insertions, 36 deletions
diff --git a/chef-utils/README.md b/chef-utils/README.md index 6bfd97a1c4..00173e6eed 100644 --- a/chef-utils/README.md +++ b/chef-utils/README.md @@ -43,7 +43,7 @@ Super Families: * `fedora_based?` - anything of fedora lineage (fedora, redhat, centos, amazon, pidora, etc) * `rpm_based?`- all `fedora_based` systems plus `suse` and any future linux distros based on RPM (excluding AIX) -* `solaris_based?`- all solaris-derived systems (opensolaris, nexentacore, omnios, smartos, etc) +* `solaris_based?`- all solaris-derived systems (opensolaris, omnios, smartos, etc) * `bsd_based?`- all bsd-derived systems (freebsd, netbsd, openbsd, dragonflybsd). ### Platform Helpers @@ -64,7 +64,6 @@ The Platform helpers provide an alternative to comparing values from `node['plat * `linuxmint_platform?` * `macos_platform?` * `netbsd_platform?` -* `nexentacore_platform?` * `omnios_platform?` * `openbsd_platform?` * `openindiana_platform?` @@ -86,7 +85,6 @@ For compatibility with old chef-sugar code the following aliases work for backwa * `centos?` * `clearos?` * `linuxmint?` -* `nexentacore?` * `omnios?` * `openindiana?` * `opensolaris?` diff --git a/chef-utils/lib/chef-utils/dsl/platform.rb b/chef-utils/lib/chef-utils/dsl/platform.rb index c2ac460ff1..322cf27cb2 100644 --- a/chef-utils/lib/chef-utils/dsl/platform.rb +++ b/chef-utils/lib/chef-utils/dsl/platform.rb @@ -235,19 +235,6 @@ module ChefUtils # chef-sugar backcompat method alias_method :openindiana?, :openindiana_platform? - # Determine if the current node is Nexenta Core Platform aka Nexenta OS. - # - # @param [Chef::Node] node the node to check - # @since 15.5 - # - # @return [Boolean] - # - def nexentacore_platform?(node = __getnode) - node["platform"] == "nexentacore" - end - # chef-sugar backcompat method - alias_method :nexentacore?, :nexentacore_platform? - # Determine if the current node is AIX. # # @param [Chef::Node] node the node to check diff --git a/chef-utils/lib/chef-utils/dsl/platform_family.rb b/chef-utils/lib/chef-utils/dsl/platform_family.rb index cfe6b617e5..422f36fc2f 100644 --- a/chef-utils/lib/chef-utils/dsl/platform_family.rb +++ b/chef-utils/lib/chef-utils/dsl/platform_family.rb @@ -320,7 +320,7 @@ module ChefUtils # @return [Boolean] # def solaris_based?(node = __getnode) - %w{solaris2 smartos omnios openindiana opensolaris nexentacore}.include?(node["platform"]) + %w{solaris2 smartos omnios openindiana opensolaris}.include?(node["platform"]) end # All of the BSD-lineage. diff --git a/cspell.json b/cspell.json index a59f601341..76e51788b9 100644 --- a/cspell.json +++ b/cspell.json @@ -1064,8 +1064,6 @@ "newguard", "newpkg", "newval", - "Nexenta", - "nexentacore", "nillable", "Nimisha", "nlist", diff --git a/lib/chef/provider/package/solaris.rb b/lib/chef/provider/package/solaris.rb index cf180ec401..95a37a5ecc 100644 --- a/lib/chef/provider/package/solaris.rb +++ b/lib/chef/provider/package/solaris.rb @@ -26,7 +26,6 @@ class Chef include Chef::Mixin::GetSourceFromPackage - provides :package, platform: "nexentacore" provides :package, platform: "solaris2", platform_version: "< 5.11" provides :solaris_package diff --git a/lib/chef/resource/solaris_package.rb b/lib/chef/resource/solaris_package.rb index c6f5d17ce9..9c5d3e330b 100644 --- a/lib/chef/resource/solaris_package.rb +++ b/lib/chef/resource/solaris_package.rb @@ -25,7 +25,6 @@ class Chef unified_mode true provides :solaris_package - provides :package, os: "solaris2", platform_family: "nexentacore" provides :package, os: "solaris2", platform_family: "solaris2", platform_version: "<= 5.10" description "Use the **solaris_package** resource to manage packages on the Solaris platform." diff --git a/spec/unit/provider_resolver_spec.rb b/spec/unit/provider_resolver_spec.rb index 6d770c1935..5be31356a0 100644 --- a/spec/unit/provider_resolver_spec.rb +++ b/spec/unit/provider_resolver_spec.rb @@ -424,7 +424,7 @@ describe Chef::ProviderResolver do it_behaves_like "a debian platform using the insserv provider" end - on_platform %w{solaris2 openindiana opensolaris nexentacore omnios smartos}, os: "solaris2", platform_version: "5.11" do + on_platform %w{solaris2 openindiana opensolaris omnios smartos}, os: "solaris2", platform_version: "5.11" do it "returns a Solaris provider" do stub_service_providers stub_service_configs @@ -811,10 +811,6 @@ describe Chef::ProviderResolver do }, "solaris2" => { - "nexentacore" => { - "3.1.4" => { - }, - }, "omnios" => { "3.1.4" => { user: [ Chef::Resource::User::SolarisUser, Chef::Provider::User::Solaris ], diff --git a/spec/unit/resource/solaris_package_spec.rb b/spec/unit/resource/solaris_package_spec.rb index 57cf6e7a3a..90b9bf0caf 100644 --- a/spec/unit/resource/solaris_package_spec.rb +++ b/spec/unit/resource/solaris_package_spec.rb @@ -21,16 +21,14 @@ require "support/shared/unit/resource/static_provider_resolution" describe Chef::Resource::SolarisPackage, "initialize" do - %w{solaris2 nexentacore}.each do |platform_family| - static_provider_resolution( - resource: Chef::Resource::SolarisPackage, - provider: Chef::Provider::Package::Solaris, - name: :solaris_package, - action: :install, - os: "solaris2", - platform_family: platform_family - ) - end + static_provider_resolution( + resource: Chef::Resource::SolarisPackage, + provider: Chef::Provider::Package::Solaris, + name: :solaris_package, + action: :install, + os: "solaris2", + platform_family: solaris2 + ) let(:resource) { Chef::Resource::SolarisPackage.new("foo") } |