aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJenkins <jenkins@review.openstack.org>2016-03-08 09:52:34 +0000
committerGerrit Code Review <review@openstack.org>2016-03-08 09:52:34 +0000
commitc018ec691982b28e03234f3527e3338d5d9147e1 (patch)
tree40010e5b127aef9aa7673fdb2dba84766c03a1c0
parentd1f6d0dee507d5ab1f8d4d866353630980a9c56e (diff)
parent5669f7e0ad2e31c68d18e326bc8b21507294f424 (diff)
downloadkolla-c018ec691982b28e03234f3527e3338d5d9147e1.tar.gz
kolla-c018ec691982b28e03234f3527e3338d5d9147e1.zip
Merge "Handle kolla-build exception"
-rwxr-xr-xkolla/cmd/build.py9
1 files changed, 7 insertions, 2 deletions
diff --git a/kolla/cmd/build.py b/kolla/cmd/build.py
index 42eaa3011..d21109647 100755
--- a/kolla/cmd/build.py
+++ b/kolla/cmd/build.py
@@ -73,8 +73,13 @@ class KollaRpmSetupUnknownConfig(Exception):
def docker_client():
- docker_kwargs = docker.utils.kwargs_from_env()
- return docker.Client(version='auto', **docker_kwargs)
+ try:
+ docker_kwargs = docker.utils.kwargs_from_env()
+ return docker.Client(version='auto', **docker_kwargs)
+ except docker.errors.DockerException:
+ LOG.exception('Can not communicate with docker service.'
+ 'Please check docker service is running without errors')
+ sys.exit(1)
class PushThread(threading.Thread):