Merge "Fix using rhel as a base build image"

This commit is contained in:
Jenkins 2016-09-20 04:28:10 +00:00 committed by Gerrit Code Review
commit 55d4c5ff73

View File

@ -18,10 +18,10 @@ from oslo_config import types
from kolla.version import version_info as version from kolla.version import version_info as version
BASE_OS_DISTRO = ['centos', 'ubuntu', 'oraclelinux', 'debian'] BASE_OS_DISTRO = ['centos', 'rhel', 'ubuntu', 'oraclelinux', 'debian']
DISTRO_RELEASE = { DISTRO_RELEASE = {
'centos': '7', 'centos': '7',
'redhat': '7', 'rhel': '7',
'oraclelinux': '7', 'oraclelinux': '7',
'debian': '8', 'debian': '8',
'ubuntu': '16.04', 'ubuntu': '16.04',