add python-py install to all other docker roles

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

diff --git a/roles/ceph-nfs/tasks/docker/pre_requisite.yml b/roles/ceph-nfs/tasks/docker/pre_requisite.yml
index f2d9ecd70cdffb7877caa52606e1c1e1816bd4ce..11724ae2c42667fe1377bd4186f01252ef0fc271 100644 (file)
--- a/roles/ceph-nfs/tasks/docker/pre_requisite.yml
+++ b/roles/ceph-nfs/tasks/docker/pre_requisite.yml
@@ -67,6 +67,23 @@
   tags:
     with_pkg
 
+# NOTE (leseb): for version 1.1.0 because https://github.com/ansible/ansible-modules-core/issues/1227
+- name: install docker-py
+  pip:
+    name: docker-py
+    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', '>=') 
+
 - name: pause after docker install before starting (on openstack vms)
   pause: seconds=5
   when: ceph_docker_on_openstack

diff --git a/roles/ceph-restapi/tasks/docker/pre_requisite.yml b/roles/ceph-restapi/tasks/docker/pre_requisite.yml
index 7b09751612024a2664fa8cf1ec3dc7a182bbb708..1a200ee4c3dc688d59a2ddc4f38a507b770bf18b 100644 (file)
--- a/roles/ceph-restapi/tasks/docker/pre_requisite.yml
+++ b/roles/ceph-restapi/tasks/docker/pre_requisite.yml
@@ -92,6 +92,23 @@
   tags:
     with_pkg
 
+# NOTE (leseb): for version 1.1.0 because https://github.com/ansible/ansible-modules-core/issues/1227
+- name: install docker-py
+  pip:
+    name: docker-py
+    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', '>=') 
+
 - name: pause after docker install before starting (on openstack vms)
   pause: seconds=5
   when: ceph_docker_on_openstack

diff --git a/roles/ceph-rgw/tasks/docker/pre_requisite.yml b/roles/ceph-rgw/tasks/docker/pre_requisite.yml
index d16c9e2fa289647c8c5bd8967e67d52b32f060dd..0a6fa266d880a1538bcb1d9a91e6a4c276bf2d6f 100644 (file)
--- a/roles/ceph-rgw/tasks/docker/pre_requisite.yml
+++ b/roles/ceph-rgw/tasks/docker/pre_requisite.yml
@@ -80,6 +80,23 @@
   tags:
     with_pkg
 
+# NOTE (leseb): for version 1.1.0 because https://github.com/ansible/ansible-modules-core/issues/1227
+- name: install docker-py
+  pip:
+    name: docker-py
+    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', '>=') 
+
 - name: pause after docker install before starting (on openstack vms)
   pause: seconds=5
   when: ceph_docker_on_openstack