Bring train platform data more in line with ohai's platform data #126
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Previously the os detection on linux set os[:family] to the name of the distribution and did not set os[:name]. This meant that `os[:family]` for CentOS was `centos` despite most uses expecting it to share the same platform family identifier as other redhat based distributions. Fixes #847 Signed-off-by: Steven Danna <[email protected]>
| if DEBIAN_FAMILY.include?(@platform[:name]) | ||
| 'debian' | ||
| elsif RHEL_FAMILY.include?(@platform[:name]) | ||
| 'rhel' |
There was a problem hiding this comment.
is there a reason, why we switch from redhat?
There was a problem hiding this comment.
I'm happy to switch this back. My goal in changing this was to bring it further in line with what ohai detects.
There was a problem hiding this comment.
We need to be compatible with Serverspec here: http://serverspec.org/advanced_tips.html They use redhat.
stevendanna
force-pushed
the
ssd/family-ohai-sync
branch
from
6575839 to
b79f0f7
Compare
|
Also see chef/chef#4665 for a discussion around amazon linux |
|
fixes inspec/inspec/issues/847 |
|
fixes inspec/inspec/issues/772 |
| @@ -12,95 +12,121 @@ | |||
|
|
|||
| module Train::Extras | |||
| module DetectLinux # rubocop:disable Metrics/ModuleLength | |||
| DEBIAN_FAMILY = %w{debian ubuntu linuxmint raspbian}.freeze | |||
| REDHAT_FAMILY = %w{centos redhat oracle scientific enterpriseenterprise amazon xenserver cloudlinux ibm_powerkvm nexus_centos wrlinux}.freeze | |||
There was a problem hiding this comment.
Per lamont's comment, we should drop amazon from this array
This includes - `family` refers to the distribuion family while `name` refers to the spcific distribution. For example, the family attribute for ubuntu is `debian`. - The `redhat` family has been renamed `rhel` - Fedora is not listed as a `rhel` platform.
stevendanna
force-pushed
the
ssd/family-ohai-sync
branch
from
b79f0f7 to
c2b2963
Compare
| @@ -66,7 +62,7 @@ def to_hash | |||
| }, | |||
| } | |||
|
|
|||
| OS['linux'] = %w{linux alpine arch coreos exherbo gentoo slackware} + OS['redhat'] + OS['debian'] + OS['suse'] | |||
| OS['linux'] = %w{linux alpine arch coreos exherbo gentoo slackware fedora} + OS['redhat'] + OS['debian'] + OS['suse'] | |||
There was a problem hiding this comment.
do we have to add amazon as a platform here?
Signed-off-by: Steven Danna <[email protected]>
|
Awesome improvements @stevendanna !! 👍 |
|
Awesome work @stevendanna ! |
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
With this PR
familyrefers to the distribuion family whilenamerefers to the specific distribution. For example, the family attribute for ubuntu isdebian. Further, architecture information is collected for Linux and OS X usinguname -m.This includes possibly breaking changes:
redhatfamily:amazon,fedora.redhatfamily whereas before they were their own families:centos oracle scientific enterpriseenterprise xenserver cloudlinux ibm_powerkvm nexus_centos wrlinuxdebianfamily wheras before they were their own families:ubuntu,linuxmint,raspbianopensuseandsuseare now part of a singlesusefamily.