From 73a1d006e44d21693a85b2ff848a0507ba3d8629 Mon Sep 17 00:00:00 2001
From: Marcin Juszkiewicz <marcin.juszkiewicz@linaro.org>
Date: Thu, 2 Jan 2020 12:58:20 +0100
Subject: [PATCH] Add '--quiet' switch

Quiet option turns off all image build logs above CRITICAL level. Handy
for checking build/push queue.

Change-Id: I9d49c9e6851341c084673ef2946acf4490c3ae8b
---
 kolla/common/config.py                                  | 4 +++-
 kolla/common/utils.py                                   | 2 ++
 kolla/image/build.py                                    | 3 +--
 releasenotes/notes/add-quiet-mode-4f386acd4bc043a5.yaml | 4 ++++
 4 files changed, 10 insertions(+), 3 deletions(-)
 create mode 100644 releasenotes/notes/add-quiet-mode-4f386acd4bc043a5.yaml

diff --git a/kolla/common/config.py b/kolla/common/config.py
index f713c29c86..7ce8d26e15 100755
--- a/kolla/common/config.py
+++ b/kolla/common/config.py
@@ -256,7 +256,9 @@ _CLI_OPTS = [
     cfg.StrOpt('openstack-branch', default='master',
                help='Branch for source images'),
     cfg.BoolOpt('docker-healthchecks', default=True,
-                help='Add Kolla docker healthcheck scripts in the image')
+                help='Add Kolla docker healthcheck scripts in the image'),
+    cfg.BoolOpt('quiet', short='q', default=False,
+                help='Do not print image logs')
 ]
 
 _BASE_OPTS = [
diff --git a/kolla/common/utils.py b/kolla/common/utils.py
index 8913b132e7..9cd8ecca9d 100644
--- a/kolla/common/utils.py
+++ b/kolla/common/utils.py
@@ -32,6 +32,8 @@ def make_a_logger(conf=None, image_name=None):
         log.addHandler(handler)
     if conf is not None and conf.debug:
         log.setLevel(logging.DEBUG)
+    elif conf is not None and conf.quiet and image_name:
+        log.setLevel(logging.CRITICAL)
     else:
         log.setLevel(logging.INFO)
     return log
diff --git a/kolla/image/build.py b/kolla/image/build.py
index a5db929842..5711a0f938 100755
--- a/kolla/image/build.py
+++ b/kolla/image/build.py
@@ -310,8 +310,7 @@ class PushIntoQueueTask(task.Task):
 
     @property
     def name(self):
-        return 'PushIntoQueueTask(%s=>%s)' % (self.push_task.name,
-                                              self.push_queue)
+        return 'PushIntoQueueTask(%s)' % (self.push_task.name)
 
     def run(self):
         self.push_queue.put(self.push_task)
diff --git a/releasenotes/notes/add-quiet-mode-4f386acd4bc043a5.yaml b/releasenotes/notes/add-quiet-mode-4f386acd4bc043a5.yaml
new file mode 100644
index 0000000000..f06db63c9e
--- /dev/null
+++ b/releasenotes/notes/add-quiet-mode-4f386acd4bc043a5.yaml
@@ -0,0 +1,4 @@
+---
+features:
+  - |
+    Adds '--quiet' switch to disable printing of image build log.