diff options
| author | Martin André <m.andre@redhat.com> | 2019-01-30 18:47:22 +0100 |
|---|---|---|
| committer | Martin André <m.andre@redhat.com> | 2019-01-30 18:47:22 +0100 |
| commit | ab942509e50e4104c5f485ffa6106a8732e094d3 (patch) | |
| tree | 382d0d8c80053d281818a3530186dce6cbab6ca9 /kolla | |
| parent | 1d6817e18146ff49486adf5432f4bfe0f1ea1920 (diff) | |
| download | kolla-ab942509e50e4104c5f485ffa6106a8732e094d3.tar.gz kolla-ab942509e50e4104c5f485ffa6106a8732e094d3.zip | |
Allow running more commands dockerless
The `--save-dependency`, `--list-images`, and `--list-dependencies`
options to the kolla-build commands do not actually require docker
daemon running. This commit stop kolla-build from complaining when it is
called with one of the above options without docker daemon started.
Change-Id: I966587236aca363316db8abbfc04763655b4b68f
Diffstat (limited to 'kolla')
| -rwxr-xr-x | kolla/image/build.py | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/kolla/image/build.py b/kolla/image/build.py index 4dd3daec7..8e136b402 100755 --- a/kolla/image/build.py +++ b/kolla/image/build.py @@ -740,7 +740,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: + if not (conf.template_only + or conf.save_dependency + or conf.list_images + or conf.list_dependencies): raise e def _get_images_dir(self): |
