Added temporary workaround for CentOS 7 os-release id bug.

saltstack · Feb 29, 2016 · a3b806d · a3b806d
1 parent 95db870
commit a3b806d
Showing 1 changed file with 7 additions and 0 deletions.
diff --git a/salt/grains/core.py b/salt/grains/core.py
@@ -1260,6 +1260,13 @@ def os_data():
             grains['osfullname'] = \
                 grains.get('lsb_distrib_id', osname).strip()
         if 'osrelease' not in grains:
+            # NOTE: This is a workaround for CentOS 7 os-release bug
+            # https://bugs.centos.org/view.php?id=8359
+            # /etc/os-release contains no minor distro release number so we fall back to parse
+            # /etc/centos-release file instead.
+            # Commit introducing this comment should be reverted after the upstream bug is released.
+            if 'CentOS Linux 7' in grains.get('lsb_distrib_codename', ''):
+                grains.pop('lsb_distrib_release', None)
             grains['osrelease'] = \
                 grains.get('lsb_distrib_release', osrelease).strip()
         grains['oscodename'] = grains.get('lsb_distrib_codename',