openstack/kolla
Code Issues Proposed changes

Merge "Update oraclelinux tag to new slim base image"

Browse Source
This commit is contained in:
Jenkins 2017-05-04 08:59:33 +00:00 committed by Gerrit Code Review
commit 1d9b3a3f87
1 changed files with 8 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
kolla/common/config.py
View File

@ -20,6 +20,13 @@ from kolla.version import version_info as version
BASE_OS_DISTRO = ['centos', 'rhel', 'ubuntu', 'oraclelinux', 'debian'] BASE_OS_DISTRO = ['centos', 'rhel', 'ubuntu', 'oraclelinux', 'debian']
BASE_ARCH = ['x86_64'] BASE_ARCH = ['x86_64']
DEFAULT_BASE_TAGS = {
'centos': '7',
'rhel': '7',
'oraclelinux': '7-slim',
'debian': '8',
'ubuntu': '16.04',
}
DISTRO_RELEASE = { DISTRO_RELEASE = {
'centos': '7', 'centos': '7',
'rhel': '7', 'rhel': '7',
@ -876,7 +883,7 @@ def parse(conf, args, usage=None, prog=None,
# NOTE(jeffrey4l): set the default base tag based on the # NOTE(jeffrey4l): set the default base tag based on the
# base option # base option
conf.set_default('base_tag', DISTRO_RELEASE.get(conf.base)) conf.set_default('base_tag', DEFAULT_BASE_TAGS.get(conf.base))
if not conf.base_image: if not conf.base_image:
conf.base_image = conf.base conf.base_image = conf.base