From: Adam Huffman <bloch@verdurin.com>
Date: Mon, 17 Oct 2016 20:44:30 +0000 (+0100)
Subject: Ensure extras repo enabled for CentOS across different roles
X-Git-Tag: v2.0~33^2
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=refs%2Fpull%2F1035%2Fhead;p=ceph-ansible.git

Ensure extras repo enabled for CentOS across different roles

Signed-off-by: Adam Huffman <bloch@verdurin.com>
---

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 }}"