From 156abd6b6a66fdf9c95383ea0cbeb4c844f1e5ff Mon Sep 17 00:00:00 2001
From: Jeffrey Zhang <zhang.lei.fly@gmail.com>
Date: Tue, 20 Sep 2016 13:46:10 +0800
Subject: [PATCH] Remove no-cache option in build.py
no-cache is marked for removal. we should move to cache parameter
instead. Ie6d5ab380a22c32eb6a5cee29ff7912e9f4cfe74 handle this parameter
for mistak.
TrivialFix
Change-Id: I4a6bc3eca07e9930381091fcf735529019523975
---
kolla/common/config.py | 2 --
kolla/image/build.py | 2 +-
2 files changed, 1 insertion(+), 3 deletions(-)
diff --git a/kolla/common/config.py b/kolla/common/config.py
index c6c90e1dda..11b8c82c96 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 4f10a75d7a..27d06b3020 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