diff options
| author | Jenkins <jenkins@review.openstack.org> | 2016-09-21 12:06:43 +0000 |
|---|---|---|
| committer | Gerrit Code Review <review@openstack.org> | 2016-09-21 12:06:43 +0000 |
| commit | c57642f649c70b63f7c46b4d706dd6851c0a2aa6 (patch) | |
| tree | 41c81fd34356ee5239950d4ae2b0ce3f8fade87b /kolla | |
| parent | aa7a338f2ed4baae69ee7673a07493341c18f19f (diff) | |
| parent | 156abd6b6a66fdf9c95383ea0cbeb4c844f1e5ff (diff) | |
| download | kolla-c57642f649c70b63f7c46b4d706dd6851c0a2aa6.tar.gz kolla-c57642f649c70b63f7c46b4d706dd6851c0a2aa6.zip | |
Merge "Remove no-cache option in build.py"
Diffstat (limited to 'kolla')
| -rw-r--r-- | kolla/common/config.py | 2 | ||||
| -rw-r--r-- | kolla/image/build.py | 2 |
2 files changed, 1 insertions, 3 deletions
diff --git a/kolla/common/config.py b/kolla/common/config.py index ab3e7d78c..e66171c7d 100644 --- a/kolla/common/config.py +++ b/kolla/common/config.py @@ -92,8 +92,6 @@ _CLI_OPTS = [ cfg.BoolOpt('cache', default=True, help='Use the Docker cache when building', ), - cfg.BoolOpt('no-cache', default=False, - help='Do not use the Docker 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:' diff --git a/kolla/image/build.py b/kolla/image/build.py index 4f10a75d7..27d06b302 100644 --- a/kolla/image/build.py +++ b/kolla/image/build.py @@ -247,7 +247,7 @@ class BuildTask(DockerTask): self.conf = conf self.image = image self.push_queue = push_queue - self.nocache = not conf.cache or conf.no_cache + self.nocache = not conf.cache self.forcerm = not conf.keep self.logger = image.logger |