From bf5c30b702ed74392245ac820082c3d7e9f35ec8 Mon Sep 17 00:00:00 2001 From: Patrick Uiterwijk Date: Sun, 20 Dec 2015 01:57:27 +0000 Subject: [PATCH] Revert "Instead of a custom task, use epel_customizationj" This reverts commit 375eaa9ed4ad80795bf22652ee142cabd848e668. --- inventory/group_vars/all | 2 +- inventory/group_vars/cloud-hardware | 2 +- .../cloud_compute/files/cloud-epel7.repo | 0 roles/cloud_compute/tasks/main.yml | 4 ++++ tasks/yumrepos.yml | 7 ++----- 5 files changed, 8 insertions(+), 7 deletions(-) rename files/common/epelcloud.repo => roles/cloud_compute/files/cloud-epel7.repo (100%) diff --git a/inventory/group_vars/all b/inventory/group_vars/all index fd93dd502a..840673127a 100644 --- a/inventory/group_vars/all +++ b/inventory/group_vars/all @@ -13,7 +13,7 @@ libdir: /usr/lib64 # Most EL systems need default EPEL repos. # Some systems (notably fed-cloud*) need to get their own # EPEL files because EPEL overrides packages in their core repos. -epel_customization: none +use_default_epel: true # example of ports for default iptables # tcp_ports: [ 22, 80, 443 ] diff --git a/inventory/group_vars/cloud-hardware b/inventory/group_vars/cloud-hardware index b3ab38d15e..f52ccb9a74 100644 --- a/inventory/group_vars/cloud-hardware +++ b/inventory/group_vars/cloud-hardware @@ -1,4 +1,4 @@ --- freezes: false -epel_customization: cloud +use_default_epel: false diff --git a/files/common/epelcloud.repo b/roles/cloud_compute/files/cloud-epel7.repo similarity index 100% rename from files/common/epelcloud.repo rename to roles/cloud_compute/files/cloud-epel7.repo diff --git a/roles/cloud_compute/tasks/main.yml b/roles/cloud_compute/tasks/main.yml index 6798c47f01..c74b26f23d 100644 --- a/roles/cloud_compute/tasks/main.yml +++ b/roles/cloud_compute/tasks/main.yml @@ -4,6 +4,10 @@ - authorized_key: user=root key="{{ lookup('file', files + '/fedora-cloud/fed09-ssh-key.pub') }}" - template: src={{ files }}/fedora-cloud/hosts dest=/etc/hosts owner=root mode=0644 +- name: Copy customized EPEL7 repo + copy: src=cloud-epel7.repo dest=/etc/yum.repos.d/cloud-epel7.repo + owner=root group=root mode=0644 + - name: Enable nested virtualization copy: content="options kvm_intel nested=1" dest=/etc/modprobe.d/nested_virt.conf owner=root group=root mode=0644 diff --git a/tasks/yumrepos.yml b/tasks/yumrepos.yml index 43149c9df4..7848db201d 100644 --- a/tasks/yumrepos.yml +++ b/tasks/yumrepos.yml @@ -8,11 +8,8 @@ - yumrepos - name: put epel repos on el systems - action: copy src="{{ item }}.repo" dest="/etc/yum.repos.d/epel{{ ansible_distribution_major_version }}.repo" - when: (ansible_distribution == 'RedHat' or ansible_distribution == 'CentOS') - with_first_found: - - {{ files }}/common/epel{{ epel_customization }}.repo - - {{ files }}/common/epel{{ ansible_distribution_major_version }}.repo + action: copy src="{{ files }}/common/epel{{ ansible_distribution_major_version }}.repo" dest="/etc/yum.repos.d/epel{{ ansible_distribution_major_version }}.repo" + when: ((ansible_distribution == 'RedHat' or ansible_distribution == 'CentOS') and use_default_epel) tags: - config - packages