diff options
| author | Zuul <zuul@review.openstack.org> | 2018-07-27 08:32:33 +0000 |
|---|---|---|
| committer | Gerrit Code Review <review@openstack.org> | 2018-07-27 08:32:33 +0000 |
| commit | d7cd35ff9a521b31cb2f6f381cbe6cd78e354549 (patch) | |
| tree | 427fa1cb89aa1764b083ebf5fcf20c247b4c046a | |
| parent | 4c4289eff910b8abe9671e47d58506ec66282e5a (diff) | |
| parent | 9cc7667a5110c59c1ffda4b75d7667ca4628e4bb (diff) | |
| download | kolla-d7cd35ff9a521b31cb2f6f381cbe6cd78e354549.tar.gz kolla-d7cd35ff9a521b31cb2f6f381cbe6cd78e354549.zip | |
Merge "build with --template-only to not require running docker service"
| -rwxr-xr-x | kolla/image/build.py | 7 |
1 files changed, 6 insertions, 1 deletions
diff --git a/kolla/image/build.py b/kolla/image/build.py index a690e98b5..513c31875 100755 --- a/kolla/image/build.py +++ b/kolla/image/build.py @@ -710,7 +710,12 @@ class KollaWorker(object): self.maintainer = conf.maintainer docker_kwargs = docker.utils.kwargs_from_env() - self.dc = docker.APIClient(version='auto', **docker_kwargs) + try: + self.dc = docker.APIClient(version='auto', **docker_kwargs) + except docker.errors.DockerException as e: + self.dc = None + if not conf.template_only: + raise e def _get_images_dir(self): possible_paths = ( |