x/browbeat
Code Issues Proposed changes

Merge "switch to yum Ansible module when possible for repo management."

Browse Source
This commit is contained in:
Alex Krzos 2016-04-19 10:40:05 -04:00 committed by Gerrit Code Review
commit d663afa1fa
2 changed files with 14 additions and 26 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
ansible/install/roles/collectd-generic/tasks/main.yml
View File

@ -3,15 +3,8 @@
# Install/run collectd for browbeat (Generic)
#
- 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 collectd rpms
yum: name={{ item }} state=present
@ -121,7 +114,8 @@
service: name=collectd state=restarted enabled=true
become: true
- 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

20
ansible/install/roles/collectd-openstack/tasks/main.yml
View File

@ -3,15 +3,8 @@
# Install/run collectd 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 collectd rpms
yum: name={{ item }} state=present
@ -85,7 +78,8 @@
service: name=collectd state=restarted enabled=true
become: true
- 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