summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorOpenShift Bot <eparis+openshiftbot@redhat.com>2017-05-16 17:34:18 -0500
committerGitHub <noreply@github.com>2017-05-16 17:34:18 -0500
commit7d506ff357d2a24a6c510b06c0987528375f1999 (patch)
treedc9e7e63c572213b7b96090e171c50c78cec3913
parent80aa02bdf6b17d2812f637131b8ac945a3f865cb (diff)
parent0414e424c90000a9aa393a1d47404b726a2443d3 (diff)
downloadopenshift-7d506ff357d2a24a6c510b06c0987528375f1999.tar.gz
openshift-7d506ff357d2a24a6c510b06c0987528375f1999.tar.bz2
openshift-7d506ff357d2a24a6c510b06c0987528375f1999.tar.xz
openshift-7d506ff357d2a24a6c510b06c0987528375f1999.zip
Merge pull request #4196 from dmsimard/paas_repo
Merged by openshift-bot
-rw-r--r--roles/openshift_repos/tasks/main.yaml8
1 files changed, 6 insertions, 2 deletions
diff --git a/roles/openshift_repos/tasks/main.yaml b/roles/openshift_repos/tasks/main.yaml
index 9a9436fcb..023b1a9b7 100644
--- a/roles/openshift_repos/tasks/main.yaml
+++ b/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"