Merge pull request #158 from openshift/master

Merge master into INT for first v3 INT deploy

1 files changed, 47 insertions, 0 deletions

diff --git a/roles/yum_repos/tasks/main.yml b/roles/yum_repos/tasks/main.yml
new file mode 100644
index 000000000..a9903c6c6
--- /dev/null
+++ b/roles/yum_repos/tasks/main.yml
@@ -0,0 +1,47 @@
+---
+# Convert old params to new params
+- set_fact:
+    repo_files:
+    - id: "{{ repo_tag }}"
+      repos:
+      - id: "{{ repo_tag }}"
+        name: "{{ repo_name }}"
+        baseurl: "{{ repo_baseurl }}"
+        enabled: "{{ repo_enabled }}"
+        gpgcheck: "{{ repo_gpg_check | default(repo_gpgcheck) }}"
+        sslverify: "{{ repo_sslverify | default(None) }}"
+        sslclientcert: "{{ repo_sslclientcert | default(None) }}"
+        sslclientkey: "{{ repo_sslclientkey | default(None) }}"
+        gpgkey: "{{ repo_gpgkey | default(None) }}"
+  when: repo_files is not defined
+
+- name: Verify repo_files is a list
+  assert:
+    that:
+    - repo_files is iterable and repo_files is not string and repo_files is not mapping
+
+- name: Verify repo_files items have an id and a repos list
+  assert:
+    that:
+    - item is mapping
+    - "'id' in item"
+    - "'repos' in item"
+    - item.repos is iterable and item.repos is not string and item.repos is not mapping
+  with_items: repo_files
+
+- name: Verify that repo_files.repos have the required keys
+  assert:
+    that:
+    - item.1 is mapping
+    - "'id' in item.1"
+    - "'name' in item.1"
+    - "'baseurl' in item.1"
+  with_subelements:
+  - repo_files
+  - repos
+
+- name: Installing yum-repo template
+  template:
+    src: yumrepo.j2
+    dest: /etc/yum.repos.d/{{ item.id }}.repo
+  with_items: repo_files