diff options
author | Tim Smith <tsmith84@gmail.com> | 2020-10-28 19:15:22 -0700 |
---|---|---|
committer | Tim Smith <tsmith84@gmail.com> | 2020-10-28 19:15:22 -0700 |
commit | 362d7f12a4f01e7edf68d5501fece6511bd49a67 (patch) | |
tree | e0580e45e21498c257f45b373c366b1f4f6dba33 | |
parent | 6d24e6a0c44180df372484c5906810e70e41e818 (diff) | |
download | chef-362d7f12a4f01e7edf68d5501fece6511bd49a67.tar.gz |
Remove opensolaris as well
https://en.wikipedia.org/wiki/OpenSolaris
Latest release 2009.06 / June 1, 2009; 11 years ago
"OpenSolaris is a discontinued open source computer operating system based on Solaris and created by Sun Microsystems."
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_family.rb | 2 | ||||
-rw-r--r-- | lib/chef/provider/package/ips.rb | 2 | ||||
-rw-r--r-- | lib/chef/provider/user/solaris.rb | 2 | ||||
-rw-r--r-- | spec/functional/resource/cron_spec.rb | 6 | ||||
-rw-r--r-- | spec/unit/provider_resolver_spec.rb | 6 |
6 files changed, 8 insertions, 14 deletions
diff --git a/chef-utils/README.md b/chef-utils/README.md index 00173e6eed..d3088a7bc2 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, omnios, smartos, etc) +* `solaris_based?`- all solaris-derived systems (omnios, smartos, openindiana, etc) * `bsd_based?`- all bsd-derived systems (freebsd, netbsd, openbsd, dragonflybsd). ### Platform Helpers @@ -67,7 +67,6 @@ The Platform helpers provide an alternative to comparing values from `node['plat * `omnios_platform?` * `openbsd_platform?` * `openindiana_platform?` -* `opensolaris_platform?` * `opensuse_platform?` * `oracle_platform?` * `raspbian_platform?` @@ -87,7 +86,6 @@ For compatibility with old chef-sugar code the following aliases work for backwa * `linuxmint?` * `omnios?` * `openindiana?` -* `opensolaris?` * `opensuse?` * `oracle?` * `raspbian?` diff --git a/chef-utils/lib/chef-utils/dsl/platform_family.rb b/chef-utils/lib/chef-utils/dsl/platform_family.rb index 422f36fc2f..d666229688 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}.include?(node["platform"]) + %w{solaris2 smartos omnios openindiana}.include?(node["platform"]) end # All of the BSD-lineage. diff --git a/lib/chef/provider/package/ips.rb b/lib/chef/provider/package/ips.rb index 129447dcab..ee997d147f 100644 --- a/lib/chef/provider/package/ips.rb +++ b/lib/chef/provider/package/ips.rb @@ -26,7 +26,7 @@ class Chef class Package class Ips < Chef::Provider::Package - provides :package, platform: %w{openindiana opensolaris omnios solaris2} + provides :package, platform: %w{openindiana omnios solaris2} provides :ips_package attr_accessor :virtual diff --git a/lib/chef/provider/user/solaris.rb b/lib/chef/provider/user/solaris.rb index 2da1d754e4..abf6cd94c8 100644 --- a/lib/chef/provider/user/solaris.rb +++ b/lib/chef/provider/user/solaris.rb @@ -25,7 +25,7 @@ class Chef class User class Solaris < Chef::Provider::User provides :solaris_user - provides :user, os: %w{openindiana opensolaris illumos omnios solaris2 smartos} + provides :user, os: %w{openindiana illumos omnios solaris2 smartos} PASSWORD_FILE = "/etc/shadow".freeze diff --git a/spec/functional/resource/cron_spec.rb b/spec/functional/resource/cron_spec.rb index 009234f527..fa53eb08a1 100644 --- a/spec/functional/resource/cron_spec.rb +++ b/spec/functional/resource/cron_spec.rb @@ -26,7 +26,7 @@ describe Chef::Resource::Cron, :requires_root, :unix_only do # Platform specific validation routines. def cron_should_exists(cron_name, command) case ohai[:platform] - when "aix", "opensolaris", "solaris2", "omnios" + when "aix", "solaris2", "omnios" expect(shell_out("crontab -l #{new_resource.user} | grep \"#{cron_name}\"").exitstatus).to eq(0) expect(shell_out("crontab -l #{new_resource.user} | grep \"#{cron_name}\"").stdout.lines.to_a.size).to eq(1) expect(shell_out("crontab -l #{new_resource.user} | grep \"#{command}\"").exitstatus).to eq(0) @@ -41,7 +41,7 @@ describe Chef::Resource::Cron, :requires_root, :unix_only do def cron_should_not_exists(cron_name) case ohai[:platform] - when "aix", "opensolaris", "solaris2", "omnios" + when "aix", "solaris2", "omnios" expect(shell_out("crontab -l #{new_resource.user} | grep \"#{cron_name}\"").exitstatus).to eq(1) expect(shell_out("crontab -l #{new_resource.user} | grep \"#{new_resource.command}\"").stdout.lines.to_a.size).to eq(0) else @@ -113,7 +113,7 @@ describe Chef::Resource::Cron, :requires_root, :unix_only do end end - exclude_solaris = %w{solaris opensolaris solaris2 omnios}.include?(ohai[:platform]) + exclude_solaris = %w{solaris solaris2 omnios}.include?(ohai[:platform]) describe "create action with various attributes", external: exclude_solaris do def create_and_validate_with_property(resource, attribute, value) if ohai[:platform] == "aix" diff --git a/spec/unit/provider_resolver_spec.rb b/spec/unit/provider_resolver_spec.rb index 5be31356a0..8b1f82ec6d 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 omnios smartos}, os: "solaris2", platform_version: "5.11" do + on_platform %w{solaris2 openindiana omnios smartos}, os: "solaris2", platform_version: "5.11" do it "returns a Solaris provider" do stub_service_providers stub_service_configs @@ -820,10 +820,6 @@ describe Chef::ProviderResolver do "3.1.4" => { }, }, - "opensolaris" => { - "3.1.4" => { - }, - }, "solaris2" => { user: [ Chef::Resource::User::SolarisUser, Chef::Provider::User::Solaris ], "5.11" => { |