aboutsummaryrefslogtreecommitdiff
path: root/kolla/common
diff options
context:
space:
mode:
authorJeffrey Zhang <jeffrey.zhang@99cloud.net>2016-05-23 10:15:38 +0800
committerJeffrey Zhang <jeffrey.zhang@99cloud.net>2016-05-31 01:41:48 +0000
commit4044a3475e51f763f8d4f3feda003f0a4837f177 (patch)
tree0f2931ac4ccd19dd60f813a12dd3810bc3cd1ba9 /kolla/common
parent3545e6d503c7451921333134fb75d3fef3713952 (diff)
downloadkolla-4044a3475e51f763f8d4f3feda003f0a4837f177.tar.gz
kolla-4044a3475e51f763f8d4f3feda003f0a4837f177.zip
Pin the base distro release version
Pin the base distro release version in the master branch(Newton). Only one distro version is supported. The supported versions are: * CentOS: 7 * RedHat: 7 * OracleLinux: 7 * Debian: 8 * Ubuntu: 14.04 NOTE: Kolla will move to Ubuntu 16.04 in the Newton cycle DocImpact TrivialFix Change-Id: I32c0edbee4de14c8a0cc7c961d566e84d70f19a4
Diffstat (limited to 'kolla/common')
-rw-r--r--kolla/common/config.py14
1 files changed, 13 insertions, 1 deletions
diff --git a/kolla/common/config.py b/kolla/common/config.py
index 83ccfb0fb..fe3972a39 100644
--- a/kolla/common/config.py
+++ b/kolla/common/config.py
@@ -18,7 +18,14 @@ from oslo_config import types
from kolla.version import version_info as version
-BASE_OS_DISTRO = ['centos', 'ubuntu', 'oraclelinux']
+BASE_OS_DISTRO = ['centos', 'ubuntu', 'oraclelinux', 'debian']
+DISTRO_RELEASE = {
+ 'centos': '7',
+ 'redhat': '7',
+ 'oraclelinux': '7',
+ 'debian': '8',
+ 'ubuntu': '14.04',
+}
RDO_MIRROR = "http://trunk.rdoproject.org/centos7"
DELOREAN = "{}/current-passed-ci/delorean.repo".format(RDO_MIRROR)
DELOREAN_DEPS = "{}/delorean-deps.repo".format(RDO_MIRROR)
@@ -290,5 +297,10 @@ def parse(conf, args, usage=None, prog=None,
prog=prog,
version=version.cached_version_string(),
default_config_files=default_config_files)
+
+ # NOTE(jeffrey4l): set the default base tag based on the
+ # base option
+ conf.set_default('base_tag', DISTRO_RELEASE.get(conf.base))
+
if not conf.base_image:
conf.base_image = conf.base