Merge "Not to pull the base images when building."

kolla/common/config.py

@@ -205,6 +205,8 @@ _CLI_OPTS = [
     cfg.StrOpt('template-override',
                help='Path to template override file'),
     cfg.StrOpt('logs-dir', help='Path to logs directory'),
+    cfg.BoolOpt('pull', default=True,
+                help='Attempt to pull a newer version of the base image.'),
 ]
 
 _BASE_OPTS = [

kolla/image/build.py

@@ -401,7 +401,7 @@ class BuildTask(DockerTask):
             tar.add(plugins_path, arcname='plugins')
 
         # Pull the latest image for the base distro only
-        pull = True if image.parent is None else False
+        pull = self.conf.pull if image.parent is None else False
 
         buildargs = self.update_buildargs()
         try:

releasenotes/notes/docker-build-nopull-base-a860d046b9059cfc.yaml

@@ -0,0 +1,6 @@
+---
+features:
+  - Add --pull/--nopull parameter for kolla-build, when --nopull is given and
+    the base image is already loaded, The docker-engine will not attempt to
+    pull a newer version of the image. This makes sense when the registry
+    server of base images is unreachable.