summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJustin Odom <jodom@tripadvisor.com>2018-10-29 16:15:39 -0400
committerTim Smith <tsmith@chef.io>2018-12-05 11:47:10 -0800
commit105778fd1c2fb468eb2f0cc5fa71f09be70f6cbe (patch)
tree11c98f0895974ea37f8dd11b4cc1567934cbbc3a
parent718fe3d2746f55bab6010c9369a12921e283c0a6 (diff)
downloadohai-105778fd1c2fb468eb2f0cc5fa71f09be70f6cbe.tar.gz
Add support for XCP-ng
Signed-off-by: Justin Odom <jodom@tripadvisor.com>
-rw-r--r--lib/ohai/plugins/linux/platform.rb5
1 files changed, 4 insertions, 1 deletions
diff --git a/lib/ohai/plugins/linux/platform.rb b/lib/ohai/plugins/linux/platform.rb
index e5ca9f27..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
@@ -283,6 +283,9 @@ Ohai.plugin(:Platform) do
elsif lsb[:id] =~ /XenServer/i
platform "xenserver"
platform_version lsb[:release]
+ elsif lsb[:id] =~ /XCP/i
+ platform "xcp"
+ platform_version lsb[:release]
elsif lsb[:id] # LSB can provide odd data that changes between releases, so we currently fall back on it rather than dealing with its subtleties
platform lsb[:id].downcase
platform_version lsb[:release]