diff options
| author | Zuul <zuul@review.opendev.org> | 2023-02-27 12:57:29 +0000 |
|---|---|---|
| committer | Gerrit Code Review <review@openstack.org> | 2023-02-27 12:57:29 +0000 |
| commit | 35088cf281da2c883b1444fa6cc76013ceba5eac (patch) | |
| tree | f68d07836c442d439cf6bec5c6b16d1d37351c3d /kolla/common | |
| parent | a627713720e1393a5296d9918fec4d9796a9b16f (diff) | |
| parent | a2854da1b3e12987f7fa7590fca3bb74ac19c53e (diff) | |
| download | kolla-35088cf281da2c883b1444fa6cc76013ceba5eac.tar.gz kolla-35088cf281da2c883b1444fa6cc76013ceba5eac.zip | |
Merge "Add a way to add other container engines"
Diffstat (limited to 'kolla/common')
| -rw-r--r-- | kolla/common/config.py | 15 |
1 files changed, 9 insertions, 6 deletions
diff --git a/kolla/common/config.py b/kolla/common/config.py index 87ecf9d50..b9e801a73 100644 --- a/kolla/common/config.py +++ b/kolla/common/config.py @@ -156,7 +156,8 @@ _CLI_OPTS = [ cfg.BoolOpt('skip-parents', default=False, help='Do not rebuild parents of matched images'), cfg.BoolOpt('skip-existing', default=False, - help='Do not rebuild images present in the docker cache'), + help='Do not rebuild images present in the container engine ' + 'cache'), cfg.DictOpt('build-args', help='Set docker build time variables'), cfg.BoolOpt('keep', default=False, @@ -172,7 +173,7 @@ _CLI_OPTS = [ cfg.StrOpt('network_mode', default='host', help='The network mode for Docker build. Example: host'), cfg.BoolOpt('cache', default=True, - help='Use the Docker cache when building'), + help='Use the container engine cache when building'), cfg.MultiOpt('profile', types.String(), short='p', help=('Build a pre-defined set of images, see [profiles]' ' section in config. The default profiles are:' @@ -190,14 +191,14 @@ _CLI_OPTS = [ help=('Build only images matching regex and its' ' dependencies')), cfg.StrOpt('registry', - help=('The docker registry host. The default registry host' - ' is Docker Hub')), + help=('The container image registry host. The default registry' + ' host is Docker Hub')), cfg.StrOpt('save-dependency', help=('Path to the file to store the docker image' ' dependency in Graphviz dot format')), cfg.StrOpt('format', short='f', default='json', choices=['json', 'none'], - help='Format to write the final results in'), + help='Format to write the final results in.'), cfg.StrOpt('tarballs-base', default=TARBALLS_BASE, help='Base url to OpenStack tarballs'), cfg.IntOpt('threads', short='T', default=8, min=1, @@ -205,7 +206,7 @@ _CLI_OPTS = [ ' (Note: setting to one will allow real time' ' logging)')), cfg.StrOpt('tag', default=version.cached_version_string(), - help='The Docker tag'), + help='The container image tag'), cfg.BoolOpt('template-only', default=False, help="Don't build images. Generate Dockerfile only"), cfg.IntOpt('timeout', default=120, @@ -246,6 +247,8 @@ _CLI_OPTS = [ help='Prefix prepended to image names'), cfg.StrOpt('repos-yaml', default='', help='Path to alternative repos.yaml file'), + cfg.StrOpt('engine', default='docker', choices=['docker'], + help='Container engine to build images on.') ] _BASE_OPTS = [ |