diff --git a/.travis.yml b/.travis.yml index 21a4b71..9b79b8a 100644 --- a/.travis.yml +++ b/.travis.yml @@ -7,7 +7,6 @@ install: - ansible --version - printf '[defaults]\nroles_path=../' > ansible.cfg script: - - ansible-galaxy install linuxhq.epel - ansible-playbook tests/test.yml -i tests/inventory --syntax-check notifications: webhooks: https://galaxy.ansible.com/api/v1/notifications/ diff --git a/README.md b/README.md index 1ef42c1..5e032b0 100644 --- a/README.md +++ b/README.md @@ -1,12 +1,16 @@ # ansible-role-elrepo [![Build Status](https://travis-ci.org/linuxhq/ansible-role-elrepo.svg?branch=master)](https://travis-ci.org/linuxhq/ansible-role-elrepo) +[![Ansible Galaxy](https://img.shields.io/badge/ansible--galaxy-elrepo-blue.svg?style=flat)](https://galaxy.ansible.com/linuxhq/elrepo) +[![License](https://img.shields.io/badge/license-GPLv3-brightgreen.svg?style=flat)](COPYING) RHEL/CentOS - ELRepo Project ## Requirements -None +This role requires that you have the epel repository installed. + + * https://galaxy.ansible.com/linuxhq/epel/ ## Role Variables @@ -27,7 +31,7 @@ Available variables are listed below, along with default values: ## Dependencies - * https://galaxy.ansible.com/linuxhq/epel/ +None ## Example Playbook diff --git a/meta/main.yml b/meta/main.yml index 3b9fe02..2e5472c 100644 --- a/meta/main.yml +++ b/meta/main.yml @@ -1,7 +1,5 @@ --- -allow_duplicates: true -dependencies: - - linuxhq.epel +dependencies: [] galaxy_info: author: tkimball83 description: RHEL/CentOS - ELRepo Project @@ -14,6 +12,5 @@ galaxy_info: - 7 galaxy_tags: - elrepo - - packaging - yum ... diff --git a/tasks/elrepo_kernel.yml b/tasks/elrepo_kernel.yml index 874f7e4..404c3f1 100644 --- a/tasks/elrepo_kernel.yml +++ b/tasks/elrepo_kernel.yml @@ -1,5 +1,5 @@ --- -- name: Removing old kernel packages +- name: Attempting to purge old kernel packages become: true yum: disable_plugin: "{{ elrepo_disable_plugin|join(',') }}" @@ -50,7 +50,7 @@ - elrepo_dist == '7' - elrepo_kernel_installed is changed -- name: Set the default kernel grub is going to boot (el6) +- name: Attempting to set the default grub kernel for el6 become: true lineinfile: dest: /boot/grub/grub.conf @@ -60,7 +60,7 @@ - elrepo_dist == '6' - elrepo_kernel_installed is changed -- name: Set the default kernel grub is going to boot (el7) +- name: Attempting to set the default grub kernel for el7 become: true command: | /usr/sbin/grub2-set-default 0 diff --git a/tasks/elrepo_repository.yml b/tasks/elrepo_repository.yml index 73b2e36..cee0cb6 100644 --- a/tasks/elrepo_repository.yml +++ b/tasks/elrepo_repository.yml @@ -1,22 +1,22 @@ --- -- name: Setting elrepo_version fact (el7) - set_fact: - elrepo_version: "7.0-3.el7" - when: elrepo_dist == '7' - -- name: Setting elrepo_version fact (el6) +- name: Attempting to set el6 elrepo_dist fact set_fact: elrepo_version: "6-8.el6" when: elrepo_dist == '6' -- name: Attempting to create temporary file +- name: Attempting to set el7 elrepo_dist fact + set_fact: + elrepo_version: "7.0-3.el7" + when: elrepo_dist == '7' + +- name: Attempting to generate temporary file tempfile: prefix: 'elrepo.' state: file suffix: '.rpm' register: elrepo_tempfile -- name: Downloading package to temporary location +- name: Attempting to download package to temporary location get_url: dest: "{{ elrepo_tempfile.path }}" force: yes @@ -36,7 +36,7 @@ register: elrepo_yum when: elrepo_get_url is success -- name: Purging temporary package from filesystem +- name: Attempting to purge temporary package from the filesystem file: path: "{{ elrepo_tempfile.path }}" state: absent @@ -44,7 +44,7 @@ - elrepo_tempfile is success - elrepo_yum is success -- name: Applying elrepo repository configurations +- name: Attempting to overlay elrepo repository configurations become: true template: src: elrepo.repo.j2 @@ -54,7 +54,7 @@ mode: 0644 when: elrepo_yum is success -- name: Ensure that the ELRepo GPG keys are installed +- name: Ensure that the elrepo gpg keys are installed become: true rpm_key: key: /etc/pki/rpm-gpg/RPM-GPG-KEY-elrepo.org