]> git-server-git.apps.pok.os.sepia.ceph.com Git - ceph-ansible.git/commit
docker: Fix #1303 1328/head
authorGuillaume Abrioux <gabrioux@redhat.com>
Tue, 21 Feb 2017 16:58:24 +0000 (17:58 +0100)
committerGuillaume Abrioux <gabrioux@redhat.com>
Fri, 3 Mar 2017 09:49:13 +0000 (10:49 +0100)
commit66b59ea9c6ace0434dab9535748881c779369307
tree422d7c656d192fd3175eb05c266db7767985aab8
parent61691a5b38540ef43194375d3f53518516f31177
docker: Fix #1303

Install package from official repos rather than pip when using RHEL.

This commit fix https://bugzilla.redhat.com/show_bug.cgi?id=1420855

Also this commit Refact all `roles/ceph-*/tasks/docker/pre_requisite.yml`
to avoid a lot of duplicated code.

Fix: #1303
Signed-off-by: Guillaume Abrioux <gabrioux@redhat.com>
19 files changed:
roles/ceph-docker-common/defaults/main.yml
roles/ceph-docker-common/tasks/main.yml
roles/ceph-docker-common/tasks/pre_requisites/debian_prerequisites.yml [new file with mode: 0644]
roles/ceph-docker-common/tasks/pre_requisites/prerequisites.yml [new file with mode: 0644]
roles/ceph-mds/tasks/docker/main.yml
roles/ceph-mds/tasks/docker/pre_requisite.yml [deleted file]
roles/ceph-mon/defaults/main.yml
roles/ceph-mon/tasks/docker/main.yml
roles/ceph-mon/tasks/docker/pre_requisite.yml [deleted file]
roles/ceph-nfs/tasks/docker/main.yml
roles/ceph-nfs/tasks/docker/pre_requisite.yml [deleted file]
roles/ceph-osd/tasks/docker/main.yml
roles/ceph-osd/tasks/docker/pre_requisite.yml [deleted file]
roles/ceph-rbd-mirror/tasks/docker/main.yml
roles/ceph-rbd-mirror/tasks/docker/pre_requisite.yml [deleted file]
roles/ceph-restapi/tasks/docker/main.yml
roles/ceph-restapi/tasks/docker/pre_requisite.yml [deleted file]
roles/ceph-rgw/tasks/docker/main.yml
roles/ceph-rgw/tasks/docker/pre_requisite.yml [deleted file]