diff --git a/roles/ceph-mds/tasks/docker/pre_requisite.yml b/roles/ceph-mds/tasks/docker/pre_requisite.yml index 880543aa5..a32d7caf0 100644 --- 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 d3012fff3..dde220721 100644 --- 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-nfs/tasks/docker/pre_requisite.yml b/roles/ceph-nfs/tasks/docker/pre_requisite.yml index f2d9ecd70..c937afc72 100644 --- 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-osd/tasks/docker/pre_requisite.yml b/roles/ceph-osd/tasks/docker/pre_requisite.yml index 98f3f3432..728d562b1 100644 --- 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', '>=') diff --git a/roles/ceph-restapi/tasks/docker/pre_requisite.yml b/roles/ceph-restapi/tasks/docker/pre_requisite.yml index 7b0975161..c4e8922c9 100644 --- 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 d16c9e2fa..c322ed12c 100644 --- 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