diff options
| author | Jeffrey Zhang <jeffrey.zhang@99cloud.net> | 2016-05-06 17:30:47 +0800 |
|---|---|---|
| committer | Jeffrey Zhang <jeffrey.zhang@99cloud.net> | 2016-05-09 07:29:19 +0000 |
| commit | 070bf258357c85a7b4411dc97f75df7d19e9792c (patch) | |
| tree | f7c5f47a0467e19f4517551bc2f1528e0ebab471 /kolla | |
| parent | fcdf187337d6741e805741822650ff98c02f74fa (diff) | |
| download | kolla-070bf258357c85a7b4411dc97f75df7d19e9792c.tar.gz kolla-070bf258357c85a7b4411dc97f75df7d19e9792c.zip | |
Support a custom base image
Add a new option(base-image) to support custom base image
In default, the base-image is equal to base. When using custom
image, please use command line like:
./tool/build.py --base-image my-image --base centos --base-tag 0.1
DocImpact
Closes-Bug: #1573544
Change-Id: If4b9c57a2b68f6f06d3e981f30b2173064e02193
Diffstat (limited to 'kolla')
| -rwxr-xr-x | kolla/cmd/build.py | 1 | ||||
| -rw-r--r-- | kolla/common/config.py | 6 |
2 files changed, 6 insertions, 1 deletions
diff --git a/kolla/cmd/build.py b/kolla/cmd/build.py index 9b818cb1d..b24cd9282 100755 --- a/kolla/cmd/build.py +++ b/kolla/cmd/build.py @@ -479,6 +479,7 @@ class KollaWorker(object): loader=jinja2.FileSystemLoader(path)) template = env.get_template(template_name) values = {'base_distro': self.base, + 'base_image': self.conf.base_image, 'base_distro_tag': self.base_tag, 'install_metatype': self.install_metatype, 'image_prefix': self.image_prefix, 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 |