Skip to content

Port #49538 to master #57166

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.

Sign up for GitHub

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

Closed
alexey-zhukovin wants to merge 2 commits into from
Closed

Port #49538 to master #57166

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
3ff426c
Port #49538 to master
brejoc May 8, 2020
9dbec88
Merge branch 'master' into master-port-49538
DmitryKuzmenko May 8, 2020
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
12 changes: 10 additions & 2 deletions salt/grains/core.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2023,8 +2023,16 @@ def os_data():
)
elif os.path.isfile("/etc/centos-release"):
log.trace("Parsing distrib info from /etc/centos-release")
# CentOS Linux
grains["lsb_distrib_id"] = "CentOS"
# Maybe CentOS Linux; could also be SUSE Expanded Support.
# SUSE ES has both, centos-release and redhat-release.
if os.path.isfile("/etc/redhat-release"):
with salt.utils.files.fopen("/etc/redhat-release") as ifile:
for line in ifile:
if "red hat enterprise linux server" in line.lower():
# This is a SUSE Expanded Support Rhel installation
grains["lsb_distrib_id"] = "RedHat"
break
grains.setdefault("lsb_distrib_id", "CentOS")
with salt.utils.files.fopen("/etc/centos-release") as ifile:
for line in ifile:
# Need to pull out the version and codename
Expand Down