Merge "Remove no-cache option in build.py"

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:'

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