Merge pull request #874 from KGoreczny/docker_module_for_ansible_2_1_support

Fix docker deployment for Ansible 2.1

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', '>=')
+

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', '>=')

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

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', '>=')

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

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