diff options
| author | Jenkins <jenkins@review.openstack.org> | 2015-12-03 11:39:43 +0000 |
|---|---|---|
| committer | Gerrit Code Review <review@openstack.org> | 2015-12-03 11:39:43 +0000 |
| commit | c21ac636912615624fc1ef4f75ba58a795d81aa2 (patch) | |
| tree | 642ca972bee67c0dd5541dde219aa90ca14d377d | |
| parent | c3906fabbab090053a70e2b87a77fcc6a4f58d4a (diff) | |
| parent | dc2ad7d134e5ed14cc0b3015313b48847a7b9b00 (diff) | |
| download | kolla-c21ac636912615624fc1ef4f75ba58a795d81aa2.tar.gz kolla-c21ac636912615624fc1ef4f75ba58a795d81aa2.zip | |
Merge "Set docker api version to auto"
| -rwxr-xr-x | kolla/cmd/build.py | 9 | ||||
| -rwxr-xr-x | tests/setup_gate.sh | 2 |
2 files changed, 8 insertions, 3 deletions
diff --git a/kolla/cmd/build.py b/kolla/cmd/build.py index 79e674c25..eea857a22 100755 --- a/kolla/cmd/build.py +++ b/kolla/cmd/build.py @@ -51,6 +51,11 @@ class KollaUnknownBuildTypeException(Exception): pass +def docker_client(): + docker_kwargs = docker.utils.kwargs_from_env() + return docker.Client(version='auto', **docker_kwargs) + + class WorkerThread(Thread): def __init__(self, queue, config): @@ -58,7 +63,7 @@ class WorkerThread(Thread): self.nocache = config['no_cache'] self.forcerm = not config['keep'] self.retries = config['retries'] - self.dc = docker.Client(**docker.utils.kwargs_from_env()) + self.dc = docker_client() super(WorkerThread, self).__init__() def end_task(self, image): @@ -581,7 +586,7 @@ class KollaWorker(object): def push_image(image): - dc = docker.Client(**docker.utils.kwargs_from_env()) + dc = docker_client() image['push_logs'] = str() for response in dc.push(image['fullname'], diff --git a/tests/setup_gate.sh b/tests/setup_gate.sh index b270c03c2..68cf7df03 100755 --- a/tests/setup_gate.sh +++ b/tests/setup_gate.sh @@ -70,7 +70,7 @@ function setup_ansible { RAW_INVENTORY=/tmp/kolla/raw_inventory mkdir /tmp/kolla - sudo -H pip install "ansible<2" docker-py + sudo -H pip install "ansible<2" "docker-py>=1.4.0,<1.6.0" setup_inventory |