Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

(FACT-2732) OracleLinux 7 and Scientific Linux 7 OS facts incorrect in Facter 4.0.30 #2014

Merged
merged 1 commit into from
Aug 6, 2020

Conversation

BogdanIrimie
Copy link
Contributor

@BogdanIrimie BogdanIrimie commented Aug 6, 2020

Added Oracle and Scientific Linux to os_hierarchy.json under Red Hat Enterprise Linux. Before the addition, they were considered default linux distributions.

@BogdanIrimie
Copy link
Contributor Author

jenkins please test this on redhat7-64a,ubuntu1604-64a,aix61-POWERfa,amazon6-64a,amazon7-64a,debian9-64a,debian9-32a,debian10-64a,fedora30-64a,fedora31-64a,fedora32-64a,osx1014-64a,osx1015-64a,centos6-64a,centos6-32a,centos8-64a,redhat7-AARCH64a,redhat8-64a,redhatfips7-64a,sles12-64a,sles12-POWERa,sles15-64a,solaris11-64a,solaris114-64a,ubuntu1604-32a,ubuntu1604-POWERa,ubuntu1804-64a,ubuntu2004-64a,windows10ent-64a,windows10ent-32a,windows2012r2-64a,windows2016-64a,windows2019-64a,windowsfips2012r2-64a

@BogdanIrimie BogdanIrimie marked this pull request as ready for review August 6, 2020 08:28
@BogdanIrimie BogdanIrimie requested review from a team August 6, 2020 08:28
Copy link
Contributor

@Filipovici-Andrei Filipovici-Andrei left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

A unit test for this particular case in the os_release_resolver_spec?

@mihaibuzgau
Copy link
Contributor

Tested on Oracle Linux 7:
Before this fix:

{
  architecture => "x86_64",
  family => "Ol",
  hardware => "x86_64",
  name => "Oracle",
  release => {
    full => "7.2",
    major => "7.2"
  },
  selinux => {
    config_mode => "enforcing",
    config_policy => "targeted",
    current_mode => "enforcing",
    enabled => true,
    enforced => true,
    policy_version => "28"
  }

After this fix was applied:

{
  architecture => "x86_64",
  family => "RedHat",
  hardware => "x86_64",
  name => "OracleLinux",
  release => {
    full => "7.2",
    major => "7",
    minor => "2"
  },
  selinux => {
    config_mode => "enforcing",
    config_policy => "targeted",
    current_mode => "enforcing",
    enabled => true,
    enforced => true,
    policy_version => "28"
  }
}

@mihaibuzgau
Copy link
Contributor

This also fixes the issue on Scientific linux 7:
Before the fix:

{
  architecture => "x86_64",
  family => "Rhel centos fedora",
  hardware => "x86_64",
  name => "Scientific",
  release => {
    full => "7.2",
    major => "7.2"
  },
  selinux => {
    enabled => false
  }
}

After the fix:

{
  architecture => "x86_64",
  family => "RedHat",
  hardware => "x86_64",
  name => "Scientific",
  release => {
    full => "7.2",
    major => "7",
    minor => "2"
  },
  selinux => {
    enabled => false
  }
}

@BogdanIrimie
Copy link
Contributor Author

@Filipovici-Andrei added a unit test for Oracle Linux name detection from os_release_resolver

@mihaibuzgau mihaibuzgau merged commit 9e0a054 into puppetlabs:4.x Aug 6, 2020
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
bug Something isn't working
Projects
None yet
Development

Successfully merging this pull request may close these issues.

3 participants