aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorZuul <zuul@review.opendev.org>2019-09-19 08:46:10 +0000
committerGerrit Code Review <review@openstack.org>2019-09-19 08:46:10 +0000
commit40d285e9fb841d9abef2f0a198458ee1c41f06aa (patch)
treea7894e70310720982205fdacf4d81d037a5b11c9
parenta1dfaff2e6fe614cb3be5b550d3902a3255a88e8 (diff)
parent2ce77bc7f84a5a662a81c3cacb3a187e02fa7e98 (diff)
downloadkolla-40d285e9fb841d9abef2f0a198458ee1c41f06aa.tar.gz
kolla-40d285e9fb841d9abef2f0a198458ee1c41f06aa.zip
Merge "build.py: fix pep8 warnings"
-rwxr-xr-xkolla/image/build.py12
1 files changed, 6 insertions, 6 deletions
diff --git a/kolla/image/build.py b/kolla/image/build.py
index 38a62d479..0b03a3a35 100755
--- a/kolla/image/build.py
+++ b/kolla/image/build.py
@@ -316,8 +316,8 @@ class PushTask(DockerTask):
self.logger.exception('Unknown error when pushing')
image.status = STATUS_PUSH_ERROR
finally:
- if (image.status not in STATUS_ERRORS
- and image.status != STATUS_UNPROCESSED):
+ if (image.status not in STATUS_ERRORS and
+ image.status != STATUS_UNPROCESSED):
self.logger.info('Pushed successfully')
self.success = True
else:
@@ -748,10 +748,10 @@ class KollaWorker(object):
self.dc = docker.APIClient(version='auto', **docker_kwargs)
except docker.errors.DockerException as e:
self.dc = None
- if not (conf.template_only
- or conf.save_dependency
- or conf.list_images
- or conf.list_dependencies):
+ if not (conf.template_only or
+ conf.save_dependency or
+ conf.list_images or
+ conf.list_dependencies):
LOG.error("Unable to connect to Docker, exiting")
LOG.info("Exception caught: {0}".format(e))
sys.exit(1)