summaryrefslogtreecommitdiffstats
path: root/roles
diff options
context:
space:
mode:
authorScott Dodson <sdodson@redhat.com>2016-07-08 13:39:23 -0400
committerGitHub <noreply@github.com>2016-07-08 13:39:23 -0400
commit1075e527eb4cfedaff503a9cbdc86d03a58d0477 (patch)
tree43b5e8151b3c2e9953fc69b7eaa558d442d08e8b /roles
parent69b47af2aa3986ac18d5fdddf5dc6ed478fe08c4 (diff)
parent7b82bb60884ef138ce9adfb08d76748c391d18d9 (diff)
downloadopenshift-1075e527eb4cfedaff503a9cbdc86d03a58d0477.tar.gz
openshift-1075e527eb4cfedaff503a9cbdc86d03a58d0477.tar.bz2
openshift-1075e527eb4cfedaff503a9cbdc86d03a58d0477.tar.xz
openshift-1075e527eb4cfedaff503a9cbdc86d03a58d0477.zip
Merge pull request #2128 from sdodson/rhel-origin
Don't special case origin on centos
Diffstat (limited to 'roles')
-rw-r--r--roles/openshift_repos/files/origin/gpg_keys/openshift-ansible-CentOS-SIG-PaaS (renamed from roles/openshift_repos/files/rhel-origin/RPM-GPG-KEY-CentOS-SIG-PaaS)0
-rw-r--r--roles/openshift_repos/files/origin/repos/openshift-ansible-centos-paas-sig.repo (renamed from roles/openshift_repos/files/rhel-origin/repos/CentOS-OpenShift-Origin.repo)0
-rw-r--r--roles/openshift_repos/tasks/centos_sig.yaml20
-rw-r--r--roles/openshift_repos/tasks/main.yaml4
4 files changed, 0 insertions, 24 deletions
diff --git a/roles/openshift_repos/files/rhel-origin/RPM-GPG-KEY-CentOS-SIG-PaaS b/roles/openshift_repos/files/origin/gpg_keys/openshift-ansible-CentOS-SIG-PaaS
index fcbaaca0e..fcbaaca0e 100644
--- a/roles/openshift_repos/files/rhel-origin/RPM-GPG-KEY-CentOS-SIG-PaaS
+++ b/roles/openshift_repos/files/origin/gpg_keys/openshift-ansible-CentOS-SIG-PaaS
diff --git a/roles/openshift_repos/files/rhel-origin/repos/CentOS-OpenShift-Origin.repo b/roles/openshift_repos/files/origin/repos/openshift-ansible-centos-paas-sig.repo
index febe0cca0..febe0cca0 100644
--- a/roles/openshift_repos/files/rhel-origin/repos/CentOS-OpenShift-Origin.repo
+++ b/roles/openshift_repos/files/origin/repos/openshift-ansible-centos-paas-sig.repo
diff --git a/roles/openshift_repos/tasks/centos_sig.yaml b/roles/openshift_repos/tasks/centos_sig.yaml
deleted file mode 100644
index 60640d8a9..000000000
--- a/roles/openshift_repos/tasks/centos_sig.yaml
+++ /dev/null
@@ -1,20 +0,0 @@
----
-- name: Install CentOS OpenShift Origin Repo on RHEL
- copy:
- src: rhel-origin/repos/CentOS-OpenShift-Origin.repo
- dest: /etc/yum.repos.d/CentOS-OpenShift-Origin.repo
- when: ansible_distribution != 'CentOS'
-
-- name: Install CentOS extras gpg key for RHEL
- copy:
- src: rhel-origin/RPM-GPG-KEY-CentOS-SIG-PaaS
- dest: /etc/pki/rpm-gpg/RPM-GPG-KEY-CentOS-SIG-PaaS
- mode: 0644
- when: ansible_distribution != 'CentOS'
-
-- name: Install the CentOS PaaS SIG release packages
- action: "{{ ansible_pkg_mgr }} name={{ item }} state=present"
- with_items:
- - centos-release-paas-common
- - centos-release-openshift-origin
- when: ansible_distribution == 'CentOS'
diff --git a/roles/openshift_repos/tasks/main.yaml b/roles/openshift_repos/tasks/main.yaml
index 32d66132e..d8e43438a 100644
--- a/roles/openshift_repos/tasks/main.yaml
+++ b/roles/openshift_repos/tasks/main.yaml
@@ -78,7 +78,3 @@
- "fedora-{{ openshift_deployment_type }}/repos/*"
notify: refresh cache
when: (ansible_distribution == "Fedora") and not openshift.common.is_containerized | bool
-
-- name: Configure the CentOS PaaS SIG repos if needed
- include: centos_sig.yaml
- when: not openshift.common.is_containerized | bool and deployment_type == 'origin' and ansible_distribution != 'Fedora'