summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorOpenShift Merge Robot <openshift-merge-robot@users.noreply.github.com>2017-11-03 09:10:06 -0700
committerGitHub <noreply@github.com>2017-11-03 09:10:06 -0700
commitadb5c51666dfe7c6b93c7bd7c87b339ef2a27f5b (patch)
treea3a233ffeee7d5626e53cd2dff7a99776bb1fc94
parentc99bfde17bca322e8a89ba3e9dc4e4fdc2776448 (diff)
parent2e146b9eac372f7c74d47b427c6aecb07a2016a5 (diff)
downloadopenshift-adb5c51666dfe7c6b93c7bd7c87b339ef2a27f5b.tar.gz
openshift-adb5c51666dfe7c6b93c7bd7c87b339ef2a27f5b.tar.bz2
openshift-adb5c51666dfe7c6b93c7bd7c87b339ef2a27f5b.tar.xz
openshift-adb5c51666dfe7c6b93c7bd7c87b339ef2a27f5b.zip
Merge pull request #5992 from abutcher/old-repo-file
Automatic merge from submit-queue. Remove old /etc/yum.repos.d/openshift_additional.repo file. Repos defined in `openshift_additional_repos` will be configured individually in their own files so we can remove the old multi-repo file.
-rw-r--r--roles/openshift_repos/tasks/main.yaml5
1 files changed, 5 insertions, 0 deletions
diff --git a/roles/openshift_repos/tasks/main.yaml b/roles/openshift_repos/tasks/main.yaml
index d41245093..95ba9fe4c 100644
--- a/roles/openshift_repos/tasks/main.yaml
+++ b/roles/openshift_repos/tasks/main.yaml
@@ -10,6 +10,11 @@
- name: Ensure libselinux-python is installed
package: name=libselinux-python state=present
+ - name: Remove openshift_additional.repo file
+ file:
+ dest: /etc/yum.repos.d/openshift_additional.repo
+ state: absent
+
- name: Create any additional repos that are defined
yum_repository:
description: "{{ item.description | default(item.name | default(item.id)) }}"