diff options
| author | Scott Dodson <sdodson@redhat.com> | 2016-07-07 12:14:30 -0400 |
|---|---|---|
| committer | Scott Dodson <sdodson@redhat.com> | 2016-07-07 17:31:26 -0400 |
| commit | 330c741eddf993e3e8004dca7f7e3aa2b342987e (patch) | |
| tree | 44672748ebe0debf3696a18176a26f939be83ea6 | |
| parent | 8a0c9b6b6a9820b38694cb23979ffc7a8c358588 (diff) | |
| download | openshift-330c741eddf993e3e8004dca7f7e3aa2b342987e.tar.gz openshift-330c741eddf993e3e8004dca7f7e3aa2b342987e.tar.bz2 openshift-330c741eddf993e3e8004dca7f7e3aa2b342987e.tar.xz openshift-330c741eddf993e3e8004dca7f7e3aa2b342987e.zip | |
Don't special case origin on centos
Just install the centos paas sig repo whenever asked for origin on RHEL or
Centos
| -rw-r--r-- | roles/openshift_repos/files/origin/gpg_keys/RPM-GPG-KEY-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/rhel-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.yaml | 20 | ||||
| -rw-r--r-- | roles/openshift_repos/tasks/main.yaml | 4 |
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/RPM-GPG-KEY-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/RPM-GPG-KEY-CentOS-SIG-PaaS diff --git a/roles/openshift_repos/files/rhel-origin/repos/CentOS-OpenShift-Origin.repo b/roles/openshift_repos/files/origin/repos/rhel-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/rhel-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' |