From ca7498aeb77c3e11d2ba55ea37487f77f2e447e7 Mon Sep 17 00:00:00 2001
From: Joe Moretti <joemoretti@gmail.com>
Date: Fri, 13 Jun 2014 13:23:25 -0500
Subject: [PATCH 1/2] Add optional docker_api_version parameter to Docker
 Module

---
 cloud/docker | 11 ++++++++++-
 1 file changed, 10 insertions(+), 1 deletion(-)

diff --git a/cloud/docker b/cloud/docker
index 79c6145bc61..80a54340517 100644
--- a/cloud/docker
+++ b/cloud/docker
@@ -107,6 +107,13 @@ options:
     required: false
     default: unix://var/run/docker.sock
     aliases: []
+  docker_api_version:
+    description:
+      - Remote API version to use
+    required: false
+    default: docker-py default remote API version
+    aliases: []
+    version_added: "1.7"
   username:
     description:
       - Set remote API username
@@ -388,7 +395,8 @@ class DockerManager:
 
         # connect to docker server
         docker_url = urlparse(module.params.get('docker_url'))
-        self.client = docker.Client(base_url=docker_url.geturl())
+        docker_api_version = module.params.get('docker_api_version')
+        self.client = docker.Client(base_url=docker_url.geturl(), version=docker_api_version)
 
 
     def get_links(self, links):
@@ -662,6 +670,7 @@ def main():
             memory_limit    = dict(default=0),
             memory_swap     = dict(default=0),
             docker_url      = dict(default='unix://var/run/docker.sock'),
+            docker_api_version = dict(default=docker.client.DEFAULT_DOCKER_API_VERSION),
             user            = dict(default=None),
             password        = dict(),
             email           = dict(),

From f367adc0210264376318491f135ef64dd0686827 Mon Sep 17 00:00:00 2001
From: James Cammarata <jimi@sngx.net>
Date: Fri, 8 Aug 2014 15:03:34 -0500
Subject: [PATCH 2/2] Update version_added field for docker_api_version param

---
 cloud/docker | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/cloud/docker b/cloud/docker
index 4dfbaa1a594..eee95435255 100644
--- a/cloud/docker
+++ b/cloud/docker
@@ -109,11 +109,11 @@ options:
     aliases: []
   docker_api_version:
     description:
-      - Remote API version to use
+      - Remote API version to use. This defaults to the current default as specified by docker-py.
     required: false
     default: docker-py default remote API version
     aliases: []
-    version_added: "1.7"
+    version_added: "1.8"
   username:
     description:
       - Set remote API username