Merge pull request #188 from openshift/master

Merge master into stage

1 files changed, 0 insertions, 41 deletions

diff --git a/roles/repos/tasks/main.yaml b/roles/repos/tasks/main.yaml
deleted file mode 100644
index 43786da41..000000000
--- a/roles/repos/tasks/main.yaml
+++ /dev/null
@@ -1,41 +0,0 @@
----
-# TODO: Add flag for enabling EPEL repo, default to false
-
-- assert:
-    that: openshift_deployment_type in known_openshift_deployment_types
-
-# TODO: remove this when origin support actually works
-- fail: msg="OpenShift Origin support is not currently enabled"
-  when: openshift_deployment_type == 'origin'
-
-- name: Create any additional repos that are defined
-  template:
-    src: yum_repo.j2
-    dest: /etc/yum.repos.d/openshift_additional.repo
-  when: openshift_additional_repos | length > 0
-
-- name: Remove the additional repos if no longer defined
-  file:
-    dest: /etc/yum.repos.d/openshift_additional.repo
-    state: absent
-  when: openshift_additional_repos | length == 0
-
-- name: Remove any yum repo files for other deployment types
-  file:
-    path: "/etc/yum.repos.d/{{ item | basename }}"
-    state: absent
-  with_fileglob:
-  - '*/*'
-  when: not (item | search("/files/" + openshift_deployment_type + "/")) and (item | search(".repo$"))
-
-- name: Configure gpg keys if needed
-  copy: src={{ item }} dest=/etc/pki/rpm-gpg/
-  with_fileglob:
-  - "{{ openshift_deployment_type }}/*"
-  when: item | basename | match("RPM-GPG-KEY-")
-
-- name: Configure yum repositories
-  copy: src={{ item }} dest=/etc/yum.repos.d/
-  with_fileglob:
-  - "{{ openshift_deployment_type }}/*"
-  when: item | basename | search(".*\.repo$")