Adds epel-testing to the list of epel repos we install in common.

This also restructures the task a bit so that we can easily add new
repos as vars. The epel-testing repo is disabled by defaulti and will
be activated by the roles that need it.

Signed-off-by: Andrew Schoen <aschoen@redhat.com>

diff --git a/roles/common/defaults/main.yml b/roles/common/defaults/main.yml
index b3dc61aff3ad370094ecff31feaab8e03f00934b..e5cb894766a2f0fa2bedf7280058a32f388b78ef 100644 (file)
--- a/roles/common/defaults/main.yml
+++ b/roles/common/defaults/main.yml
@@ -1,4 +1,17 @@
+---
 # Repos to enable in Red Hat Subscription Manager
 rhsm_repos: []
 
 kerberos_realm: EXAMPLE.COM
+
+epel_repos:
+  epel:
+    name: "Extra Packages for Enterprise Linux"
+    baseurl: "{{ epel_mirror_baseurl }}/{{ ansible_distribution_major_version }}/$basearch"
+    enabled: 1
+    gpgcheck: 0
+  epel-testing:
+    name: "Extra Packages for Enterprise Linux - Testing"
+    baseurl: "{{ epel_mirror_baseurl }}/testing/{{ ansible_distribution_major_version }}/$basearch"
+    enabled: 0
+    gpgcheck: 0

diff --git a/roles/common/tasks/epel.yml b/roles/common/tasks/epel.yml
index 80e671c3a8f953758e3fe76377256117446891f3..4b73fcd5228e5f0e90212bc5344804715f20fcfc 100644 (file)
--- a/roles/common/tasks/epel.yml
+++ b/roles/common/tasks/epel.yml
@@ -1,12 +1,13 @@
 ---
-- name: Create /etc/yum.repos.d/epel.repo.
+- name: Configure epel repos in /etc/yum.repos.d/
   template:
-    src: epel.repo
-    dest: /etc/yum.repos.d/epel.repo
+    src: yum_repo.j2
+    dest: /etc/yum.repos.d/{{ item.key }}.repo
     owner: root
     group: root
     mode: 0644
   register: epel_repo
+  with_dict: epel_repos
 
 - name: Clean yum cache
   shell: yum clean all

diff --git a/roles/common/templates/epel.repo b/roles/common/templates/epel.repo
deleted file mode 100644 (file)
index 485a486..0000000
--- a/roles/common/templates/epel.repo
+++ /dev/null
@@ -1,8 +0,0 @@
-#
-# {{ ansible_managed }}
-#
-[epel]
-name="Extra Packages for Enterprise Linux"
-baseurl="{{ epel_mirror_baseurl }}/{{ ansible_distribution_major_version }}/$basearch"
-enabled=1
-gpgcheck=0

diff --git a/roles/common/templates/yum_repo.j2 b/roles/common/templates/yum_repo.j2
new file mode 100644 (file)
index 0000000..d9e2bd0
--- /dev/null
+++ b/roles/common/templates/yum_repo.j2
@@ -0,0 +1,8 @@
+#
+# {{ ansible_managed }}
+#
+
+[{{ item.key }}]
+{% for k, v in item.value.iteritems() | sort -%}
+  {{ k }}={{ v }}
+{% endfor %}