Merge "move to using yum module when possible in grafana/graphite playbooks."

ansible/install/roles/grafana/tasks/main.yml

@@ -3,15 +3,8 @@
 # Install/run grafana-server for browbeat
 #
 
-- name: Check for epel
-  shell: rpm -qa | grep -q epel-release
-  ignore_errors: true
-  register: epel_installed
-
-- name: Install epel repo
-  command: rpm -ivh {{ epel_repo }}
-  become: true
-  when: epel_installed.rc != 0
+- name: Check for EPEL repo
+  yum: name=epel-release state=present
 
 - name: Install grafana rpms
   yum: name={{ item }} state=present
@@ -71,7 +64,8 @@
   file: path={{role_path}}/files/data_source.json state=absent
   connection: local
 
-- name: Disable EPEL
-  shell: rpm -e epel-release
-  ignore_errors: true
-  become: true
+- name: Disable EPEL Repo
+  ini_file: dest=/etc/yum.repos.d/epel.repo
+    section=epel
+    option=enabled
+    value=0

ansible/install/roles/graphite/tasks/main.yml

@@ -3,15 +3,8 @@
 # Install/run graphite-web for browbeat
 #
 
-- name: Check for epel
-  shell: rpm -qa | grep -q epel-release
-  ignore_errors: true
-  register: epel_installed
-
-- name: Install epel repo
-  command: rpm -ivh {{ epel_repo }}
-  become: true
-  when: epel_installed.rc != 0
+- name: Check for EPEL repo
+  yum: name=epel-release state=present
 
 - name: Install graphite rpms
   yum: name={{ item }} state=present
@@ -121,7 +114,8 @@
   become: true
   when: carbon_cache_needs_restart.changed
 
-- name: Disable EPEL
-  shell: rpm -e epel-release
-  ignore_errors: true
-  become: true
+- name: Disable EPEL Repo
+  ini_file: dest=/etc/yum.repos.d/epel.repo
+    section=epel
+    option=enabled
+    value=0