diff options
| author | Justin Odom <jodom@tripadvisor.com> | 2018-12-05 12:49:47 -0500 |
|---|---|---|
| committer | Tim Smith <tsmith@chef.io> | 2018-12-05 11:47:18 -0800 |
| commit | b7095290fbf1e9cc17975299c775c43bc28c2ad4 (patch) | |
| tree | 11c98f0895974ea37f8dd11b4cc1567934cbbc3a | |
| parent | 8b0bb1911d3b96326ee787c9050a65df833e697b (diff) | |
| download | ohai-b7095290fbf1e9cc17975299c775c43bc28c2ad4.tar.gz | |
Revert "Move xcp platform_family to fedora"
This reverts commit f3ebf27cd2fbf07116afac39dd2fef252d239111.
Move xcp support back to RHEL.
| -rw-r--r-- | lib/ohai/plugins/linux/platform.rb | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/lib/ohai/plugins/linux/platform.rb b/lib/ohai/plugins/linux/platform.rb index 58216cb0..6c5f7e5b 100644 --- a/lib/ohai/plugins/linux/platform.rb +++ b/lib/ohai/plugins/linux/platform.rb @@ -127,7 +127,7 @@ Ohai.plugin(:Platform) do when /debian/, /ubuntu/, /linuxmint/, /raspbian/, /cumulus/ # apt-get+dpkg almost certainly goes here "debian" - when /oracle/, /centos/, /redhat/, /scientific/, /enterpriseenterprise/, /xenserver/, /cloudlinux/, /ibm_powerkvm/, /parallels/, /nexus_centos/, /clearos/, /bigip/ # Note that 'enterpriseenterprise' is oracle's LSB "distributor ID" + when /oracle/, /centos/, /redhat/, /scientific/, /enterpriseenterprise/, /xcp/, /xenserver/, /cloudlinux/, /ibm_powerkvm/, /parallels/, /nexus_centos/, /clearos/, /bigip/ # Note that 'enterpriseenterprise' is oracle's LSB "distributor ID" # NOTE: "rhel" should be reserved exclusively for recompiled rhel versions that are nearly perfectly compatible down to the platform_version. # The operating systems that are "rhel" should all be as compatible as rhel7 = centos7 = oracle7 = scientific7 (98%-ish core RPM version compatibility # and the version numbers MUST track the upstream). The appropriate EPEL version repo should work nearly perfectly. Some variation like the @@ -139,7 +139,7 @@ Ohai.plugin(:Platform) do "amazon" when /suse/, /sles/, /opensuse/, /opensuseleap/, /sled/ "suse" - when /fedora/, /pidora/, /arista_eos/, /xcp/ + when /fedora/, /pidora/, /arista_eos/ # In the broadest sense: RPM-based, fedora-derived distributions which are not strictly re-compiled RHEL (if it uses RPMs, and smells more like redhat and less like # SuSE it probably goes here). "fedora" |