aboutsummaryrefslogtreecommitdiff
path: root/kolla/common
diff options
context:
space:
mode:
authorJenkins <jenkins@review.openstack.org>2016-05-09 09:32:53 +0000
committerGerrit Code Review <review@openstack.org>2016-05-09 09:32:53 +0000
commit17e6684c1a42b999e6b213826ecf4499329de131 (patch)
tree8c5c9201e55fa119a6c61d89df640f49d2e9135e /kolla/common
parentb1e0ce0d3899a28a3ad2f7443720cd9c71d4757b (diff)
parent070bf258357c85a7b4411dc97f75df7d19e9792c (diff)
downloadkolla-17e6684c1a42b999e6b213826ecf4499329de131.tar.gz
kolla-17e6684c1a42b999e6b213826ecf4499329de131.zip
Merge "Support a custom base image"
Diffstat (limited to 'kolla/common')
-rw-r--r--kolla/common/config.py6
1 files changed, 5 insertions, 1 deletions
diff --git a/kolla/common/config.py b/kolla/common/config.py
index 31836c4ba..83ccfb0fb 100644
--- a/kolla/common/config.py
+++ b/kolla/common/config.py
@@ -56,10 +56,12 @@ _CLI_OPTS = [
cfg.StrOpt('base', short='b', default='centos',
choices=BASE_OS_DISTRO,
deprecated_group='kolla-build',
- help='The base distro to use when building'),
+ help='The distro type of the base image'),
cfg.StrOpt('base-tag', default='latest',
deprecated_group='kolla-build',
help='The base distro image tag'),
+ cfg.StrOpt('base-image', default=None,
+ help='The base image name. Default is the same with base'),
cfg.BoolOpt('debug', short='d', default=False,
deprecated_group='kolla-build',
help='Turn on debugging log level'),
@@ -288,3 +290,5 @@ def parse(conf, args, usage=None, prog=None,
prog=prog,
version=version.cached_version_string(),
default_config_files=default_config_files)
+ if not conf.base_image:
+ conf.base_image = conf.base