Merge pull request #4196 from dmsimard/paas_repo

Merged by openshift-bot

roles/openshift_repos/tasks/main.yaml

@@ -24,15 +24,19 @@
     - openshift_additional_repos | length == 0
     notify: refresh cache
 
+  # Note: OpenShift repositories under CentOS may be shipped through the
+  # "centos-release-openshift-origin" package which configures the repository.
+  # This task matches the file names provided by the package so that they are
+  # not installed twice in different files and remains idempotent.
   - name: Configure origin gpg keys if needed
     copy:
       src: "{{ item.src }}"
       dest: "{{ item.dest }}"
     with_items:
     - src: origin/gpg_keys/openshift-ansible-CentOS-SIG-PaaS
-      dest: /etc/pki/rpm-gpg/
+      dest: /etc/pki/rpm-gpg/RPM-GPG-KEY-CentOS-SIG-PaaS
     - src: origin/repos/openshift-ansible-centos-paas-sig.repo
-      dest: /etc/yum.repos.d/
+      dest: /etc/yum.repos.d/CentOS-OpenShift-Origin.repo
     notify: refresh cache
     when:
     - ansible_os_family == "RedHat"