Merge "Add '--quiet' switch"
This commit is contained in:
commit
7c116653e3
|
@ -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 = [
|
||||
|
|
|
@ -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
|
||||
|
|
|
@ -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)
|
||||
|
|
|
@ -0,0 +1,4 @@
|
|||
---
|
||||
features:
|
||||
- |
|
||||
Adds '--quiet' switch to disable printing of image build log.
|
Loading…
Reference in New Issue