sig_cloud/diskimage-builder
2
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Fix $DISTRO_NAME usage for centos7 element

Browse Source 
In both of the changed files in this patch, the $DISTRO_NAME usage
is checking against "centos".  The valid value for the centos7
element for $DISTRO_NAME is "centos7"[1].

[1] http://git.io/8IvuTw

Change-Id: I0c4a4b2ecf87c7a9283d10071f6feb494a6c716a
This commit is contained in:
Ryan Brady 2014-10-01 21:32:32 -04:00
parent de60893ccd
commit c8037cc73f
2 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
elements/pkg-map/bin/pkg-map
View File

@ -22,7 +22,7 @@ import sys
def os_family(distro):
family = None
if distro in ['centos', 'fedora', 'rhel', 'rhel7', 'centos7']:
if distro in ['fedora', 'rhel', 'rhel7', 'centos7']:
family = 'redhat'
elif distro in ['debian', 'ubuntu']:
family = 'debian'

2
elements/svc-map/extra-data.d/10-merge-svc-map-files
View File

@ -7,7 +7,7 @@ import yaml
def os_family(distro):
"""Given a distribution, returns a operating system family."""
family = None
if distro in ['centos', 'fedora', 'rhel', 'rhel7']:
if distro in ['centos7', 'fedora', 'rhel', 'rhel7']:
family = 'redhat'
elif distro in ['debian', 'ubuntu']:
family = 'debian'