simplify repo configuration

1 files changed, 9 insertions, 50 deletions

diff --git a/roles/openshift_repos/tasks/main.yaml b/roles/openshift_repos/tasks/main.yaml
index 07a8d28fd..7ebfc6b44 100644
--- a/roles/openshift_repos/tasks/main.yaml
+++ b/roles/openshift_repos/tasks/main.yaml
@@ -29,62 +29,21 @@
   when: openshift_additional_repos | length == 0 and not openshift.common.is_containerized | bool
   notify: refresh cache
 
-- name: Remove any yum repo files for other deployment types RHEL/CentOS
-  file:
-    path: "/etc/yum.repos.d/{{ item | basename }}"
-    state: absent
-  with_fileglob:
-  - "fedora-openshift-enterprise/repos/*"
-  - "fedora-origin/repos/*"
-  - "online/repos/*"
-  - "openshift-enterprise/repos/*"
-  - "origin/repos/*"
-  - "removed/repos/*"
-  when: not openshift.common.is_containerized | bool
-        and not (item | search("/files/" ~ openshift_deployment_type ~ "/repos"))
-        and (ansible_os_family == "RedHat" and ansible_distribution != "Fedora")
-  notify: refresh cache
-
-- name: Remove any yum repo files for other deployment types Fedora
-  file:
-    path: "{{ item | basename }}"
-    state: absent
-  with_fileglob:
-  - "fedora-openshift-enterprise/repos/*"
-  - "fedora-origin/repos/*"
-  - "online/repos/*"
-  - "openshift-enterprise/repos/*"
-  - "origin/repos/*"
-  - "removed/repos/*"
-  when: not openshift.common.is_containerized | bool
-        and not (item | search("/files/fedora-" ~ openshift_deployment_type ~ "/repos"))
-        and (ansible_distribution == "Fedora")
-  notify: refresh cache
-
-- name: Configure gpg keys if needed
+- name: Configure origin gpg keys if needed
   copy:
-    src: "{{ item }}"
+    src: origin/gpg_keys/openshift-ansible-CentOS-SIG-PaaS
     dest: /etc/pki/rpm-gpg/
-  with_fileglob:
-  - "{{ openshift_deployment_type }}/gpg_keys/*"
   notify: refresh cache
-  when: not openshift.common.is_containerized | bool
-
-- name: Configure yum repositories RHEL/CentOS
-  copy:
-    src: "{{ item }}"
-    dest: /etc/yum.repos.d/
-  with_fileglob:
-  - "{{ openshift_deployment_type }}/repos/*"
-  notify: refresh cache
-  when: (ansible_os_family == "RedHat" and ansible_distribution != "Fedora")
+  when: ansible_os_family == "RedHat" and ansible_distribution != "Fedora"
+        and openshift_deployment_type == 'origin'
         and not openshift.common.is_containerized | bool
 
-- name: Configure yum repositories Fedora
+- name: Configure origin yum repositories RHEL/CentOS
   copy:
+    src: origin/repos/openshift-ansible-centos-paas-sig.repo
     src: "{{ item }}"
     dest: /etc/yum.repos.d/
-  with_fileglob:
-  - "fedora-{{ openshift_deployment_type }}/repos/*"
   notify: refresh cache
-  when: (ansible_distribution == "Fedora") and not openshift.common.is_containerized | bool
+  when: ansible_os_family == "RedHat" and ansible_distribution != "Fedora"
+        and openshift_deployment_type == 'origin'
+        and not openshift.common.is_containerized | bool