summaryrefslogtreecommitdiff
path: root/docker/api/swarm.py
diff options
context:
space:
mode:
authorJoffrey F <joffrey@docker.com>2016-12-06 16:58:07 -0800
committerJoffrey F <joffrey@docker.com>2016-12-07 14:51:14 -0800
commit738cfdcdf96e7ff56f6bb3a4966e337187ba51c4 (patch)
tree4394765fe0ad73e657f44d739c57f8cf09b60ec5 /docker/api/swarm.py
parentb71f34e948bdf986660989f3e8a052db7bb1335c (diff)
downloaddocker-py-dnephin-add-attachable.tar.gz
Update code and tests for Engine 1.13 compatibilitydnephin-add-attachable
Makefile now runs tests against Docker 1.13 RC Signed-off-by: Joffrey F <joffrey@docker.com>
Diffstat (limited to 'docker/api/swarm.py')
-rw-r--r--docker/api/swarm.py4
1 files changed, 4 insertions, 0 deletions
diff --git a/docker/api/swarm.py b/docker/api/swarm.py
index 6a1b752..edc206f 100644
--- a/docker/api/swarm.py
+++ b/docker/api/swarm.py
@@ -197,6 +197,10 @@ class SwarmApiMixin(object):
# Ignore "this node is not part of a swarm" error
if force and response.status_code == http_client.NOT_ACCEPTABLE:
return True
+ # FIXME: Temporary workaround for 1.13.0-rc bug
+ # https://github.com/docker/docker/issues/29192
+ if force and response.status_code == http_client.SERVICE_UNAVAILABLE:
+ return True
self._raise_for_status(response)
return True