Fix for Ansible 2.1: install docker-py in version matched to ansible docker module

Signed-off-by: KGoreczny <krzysztof.goreczny@intel.com>

diff --git a/roles/ceph-mds/tasks/docker/pre_requisite.yml b/roles/ceph-mds/tasks/docker/pre_requisite.yml
index 880543aa51a6ba316ca5a9312bbd9359a00ef471..8633426fda5ea6dd84e94d46191c3939e80a2190 100644 (file)
--- a/roles/ceph-mds/tasks/docker/pre_requisite.yml
+++ b/roles/ceph-mds/tasks/docker/pre_requisite.yml
@@ -115,3 +115,13 @@
     version: 1.1.0
   tags:
     with_pkg
+  when: ansible_version['full'] | version_compare('2.1.0.0', '<') 
+ 
+- name: install docker-py
+  pip:
+    name: docker-py
+    state: latest
+  tags:
+    with_pkg
+  when: ansible_version['full'] | version_compare('2.1.0.0', '>=') 
+

diff --git a/roles/ceph-mon/tasks/docker/pre_requisite.yml b/roles/ceph-mon/tasks/docker/pre_requisite.yml
index d3012fff3d5e9d04bf39972687a68eb8f05a8ce1..34a4ea96c7a3f2586201caeb9655da2cbd66e8cf 100644 (file)
--- a/roles/ceph-mon/tasks/docker/pre_requisite.yml
+++ b/roles/ceph-mon/tasks/docker/pre_requisite.yml
@@ -117,3 +117,12 @@
     version: 1.1.0
   tags:
     with_pkg
+  when: ansible_version['full'] | version_compare('2.1.0.0', '<') 
+ 
+- name: install docker-py
+  pip:
+    name: docker-py
+    state: latest
+  tags:
+    with_pkg
+  when: ansible_version['full'] | version_compare('2.1.0.0', '>=') 

diff --git a/roles/ceph-osd/tasks/docker/pre_requisite.yml b/roles/ceph-osd/tasks/docker/pre_requisite.yml
index 98f3f3432593f668377d3f1894295731ca438c00..bfd4b31634baa45ee6d6229c6a6bd32d94db45d2 100644 (file)
--- a/roles/ceph-osd/tasks/docker/pre_requisite.yml
+++ b/roles/ceph-osd/tasks/docker/pre_requisite.yml
@@ -116,3 +116,12 @@
     version: 1.1.0
   tags:
     with_pkg
+  when: ansible_version['full'] | version_compare('2.1.0.0', '<') 
+ 
+- name: install docker-py
+  pip:
+    name: docker-py
+    state: latest
+  tags:
+    with_pkg
+  when: ansible_version['full'] | version_compare('2.1.0.0', '>=')