From 65bd0228347351c3cc69871af917769539cc3d19 Mon Sep 17 00:00:00 2001 From: KGoreczny Date: Tue, 12 Jul 2016 12:54:27 +0200 Subject: [PATCH] add python-py install to all other docker roles Signed-off-by: KGoreczny --- roles/ceph-nfs/tasks/docker/pre_requisite.yml | 17 +++++++++++++++++ .../ceph-restapi/tasks/docker/pre_requisite.yml | 17 +++++++++++++++++ roles/ceph-rgw/tasks/docker/pre_requisite.yml | 17 +++++++++++++++++ 3 files changed, 51 insertions(+) diff --git a/roles/ceph-nfs/tasks/docker/pre_requisite.yml b/roles/ceph-nfs/tasks/docker/pre_requisite.yml index f2d9ecd70..11724ae2c 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-restapi/tasks/docker/pre_requisite.yml b/roles/ceph-restapi/tasks/docker/pre_requisite.yml index 7b0975161..1a200ee4c 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..0a6fa266d 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