From f3dea0d40aae9fbe474c1c58566151d22ad10c88 Mon Sep 17 00:00:00 2001 From: Adam Huffman Date: Sun, 16 Oct 2016 23:23:43 +0100 Subject: [PATCH 1/3] Ensure extras repo enabled on CentOS --- roles/ceph-mon/tasks/docker/pre_requisite.yml | 12 ++++++++++++ 1 file changed, 12 insertions(+) diff --git a/roles/ceph-mon/tasks/docker/pre_requisite.yml b/roles/ceph-mon/tasks/docker/pre_requisite.yml index 9c27ee8cc..f4f29b6f5 100644 --- a/roles/ceph-mon/tasks/docker/pre_requisite.yml +++ b/roles/ceph-mon/tasks/docker/pre_requisite.yml @@ -33,6 +33,18 @@ tags: with_pkg +# ensure extras enabled for docker +- name: enable extras on centos + yum_repository: + name: extras + state: present + enabled: yes + when: + - ansible_os_family == 'RedHat' + - ansible_distribution == 'CentOS' + tags: + with_pkg + - name: install pip on redhat yum: name: "{{ item }}" From 4315166e91d2ecff1b679998a5431b2d7ad811b1 Mon Sep 17 00:00:00 2001 From: Adam Huffman Date: Mon, 17 Oct 2016 10:39:06 +0100 Subject: [PATCH 2/3] Remove superfluous distro family check Signed-off-by: Adam Huffman --- roles/ceph-mon/tasks/docker/pre_requisite.yml | 1 - 1 file changed, 1 deletion(-) diff --git a/roles/ceph-mon/tasks/docker/pre_requisite.yml b/roles/ceph-mon/tasks/docker/pre_requisite.yml index f4f29b6f5..ec44581a3 100644 --- a/roles/ceph-mon/tasks/docker/pre_requisite.yml +++ b/roles/ceph-mon/tasks/docker/pre_requisite.yml @@ -40,7 +40,6 @@ state: present enabled: yes when: - - ansible_os_family == 'RedHat' - ansible_distribution == 'CentOS' tags: with_pkg From 9de16e4d94bd01875520be6c140836af9515ca62 Mon Sep 17 00:00:00 2001 From: Adam Huffman Date: Mon, 17 Oct 2016 21:44:30 +0100 Subject: [PATCH 3/3] Ensure extras repo enabled for CentOS across different roles Signed-off-by: Adam Huffman --- roles/ceph-mds/tasks/docker/pre_requisite.yml | 9 +++++++++ roles/ceph-nfs/tasks/docker/pre_requisite.yml | 9 +++++++++ roles/ceph-osd/tasks/pre_requisite.yml | 8 ++++++++ roles/ceph-rbd-mirror/tasks/docker/pre_requisite.yml | 9 +++++++++ roles/ceph-restapi/tasks/docker/pre_requisite.yml | 9 +++++++++ roles/ceph-rgw/tasks/docker/pre_requisite.yml | 9 +++++++++ 6 files changed, 53 insertions(+) diff --git a/roles/ceph-mds/tasks/docker/pre_requisite.yml b/roles/ceph-mds/tasks/docker/pre_requisite.yml index 972003be3..a3ef113f3 100644 --- a/roles/ceph-mds/tasks/docker/pre_requisite.yml +++ b/roles/ceph-mds/tasks/docker/pre_requisite.yml @@ -38,6 +38,15 @@ with_pkg failed_when: false +- name: enable extras repo for centos + yum_repository: + name: extras + state: present + enabled: yes + when: ansible_distribution == 'CentOS' + tags: + with_pkg + - name: install pip on redhat yum: name: "{{ item }}" diff --git a/roles/ceph-nfs/tasks/docker/pre_requisite.yml b/roles/ceph-nfs/tasks/docker/pre_requisite.yml index 69b538518..27142aa46 100644 --- a/roles/ceph-nfs/tasks/docker/pre_requisite.yml +++ b/roles/ceph-nfs/tasks/docker/pre_requisite.yml @@ -24,6 +24,15 @@ tags: with_pkg +- name: enable extras repo for centos + yum_repository: + name: extras + state: present + enabled: yes + when: ansible_distribution == 'CentOS' + tags: + with_pkg + - name: install pip and docker on redhat yum: name: "{{ item }}" diff --git a/roles/ceph-osd/tasks/pre_requisite.yml b/roles/ceph-osd/tasks/pre_requisite.yml index 4941471b3..a7129ce11 100644 --- a/roles/ceph-osd/tasks/pre_requisite.yml +++ b/roles/ceph-osd/tasks/pre_requisite.yml @@ -5,6 +5,14 @@ state: present when: ansible_os_family == 'Debian' +- name: enable extras repo on centos + yum_repository: + name: extras + state: present + enabled: yes + when: + - ansible_distribution == 'CentOS' + - name: install redhat dependencies via yum yum: name: parted diff --git a/roles/ceph-rbd-mirror/tasks/docker/pre_requisite.yml b/roles/ceph-rbd-mirror/tasks/docker/pre_requisite.yml index 6cc5e0bba..525140264 100644 --- a/roles/ceph-rbd-mirror/tasks/docker/pre_requisite.yml +++ b/roles/ceph-rbd-mirror/tasks/docker/pre_requisite.yml @@ -38,6 +38,15 @@ with_pkg failed_when: false +- name: enable extras repo for centos + yum_repository: + name: extras + state: present + enabled: yes + when: ansible_distribution == 'CentOS' + tags: + with_pkg + - name: install pip on redhat yum: name: "{{ item }}" diff --git a/roles/ceph-restapi/tasks/docker/pre_requisite.yml b/roles/ceph-restapi/tasks/docker/pre_requisite.yml index d89fe36f6..d004714ad 100644 --- a/roles/ceph-restapi/tasks/docker/pre_requisite.yml +++ b/roles/ceph-restapi/tasks/docker/pre_requisite.yml @@ -32,6 +32,15 @@ tags: with_pkg +- name: enable extras repo on centos + yum_repository: + name: extras + state: present + enabled: yes + when: ansible_distribution == 'CentOS' + tags: + with_pkg + - name: install pip on redhat yum: name: "{{ item }}" diff --git a/roles/ceph-rgw/tasks/docker/pre_requisite.yml b/roles/ceph-rgw/tasks/docker/pre_requisite.yml index 92c3ae8ae..d135a7f1d 100644 --- a/roles/ceph-rgw/tasks/docker/pre_requisite.yml +++ b/roles/ceph-rgw/tasks/docker/pre_requisite.yml @@ -32,6 +32,15 @@ tags: with_pkg +- name: enable extras repo on centos + yum_repository: + name: extras + state: present + enabled: yes + when: ansible_distribution == 'CentOS' + tags: + with_pkg + - name: install pip on redhat yum: name: "{{ item }}"