diff options
| author | Jenkins <jenkins@review.openstack.org> | 2017-05-04 08:59:33 +0000 |
|---|---|---|
| committer | Gerrit Code Review <review@openstack.org> | 2017-05-04 08:59:33 +0000 |
| commit | 1d9b3a3f87dee53b3bc5ec3a1b6c841ef6dc64a9 (patch) | |
| tree | 97b02fe33759fda12cbb2e2899b495434cc4b748 /kolla | |
| parent | d2b07c553d2395621a4d28fbbe15a153ddaff584 (diff) | |
| parent | fe777f4e76263a10def1e2e507c429971e05cd04 (diff) | |
| download | kolla-1d9b3a3f87dee53b3bc5ec3a1b6c841ef6dc64a9.tar.gz kolla-1d9b3a3f87dee53b3bc5ec3a1b6c841ef6dc64a9.zip | |
Merge "Update oraclelinux tag to new slim base image"
Diffstat (limited to 'kolla')
| -rwxr-xr-x | kolla/common/config.py | 9 |
1 files changed, 8 insertions, 1 deletions
diff --git a/kolla/common/config.py b/kolla/common/config.py index 429efb6cc..5c096da58 100755 --- a/kolla/common/config.py +++ b/kolla/common/config.py @@ -20,6 +20,13 @@ from kolla.version import version_info as version BASE_OS_DISTRO = ['centos', 'rhel', 'ubuntu', 'oraclelinux', 'debian'] BASE_ARCH = ['x86_64'] +DEFAULT_BASE_TAGS = { + 'centos': '7', + 'rhel': '7', + 'oraclelinux': '7-slim', + 'debian': '8', + 'ubuntu': '16.04', +} DISTRO_RELEASE = { 'centos': '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 # 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: conf.base_image = conf.base |