diff options
| author | Scott Dodson <sdodson@redhat.com> | 2016-07-06 16:57:25 -0400 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2016-07-06 16:57:25 -0400 |
| commit | 17760a76fb8578bba27439f86c432fa64d484d73 (patch) | |
| tree | 712c72dbe1c7aa39b69e82ccd05674f4cf93f566 /roles/openshift_repos | |
| parent | 4f6d1b8dc386e44e80e9a3d8f4ac449cf7eab92a (diff) | |
| parent | 79120836a6332ab23ced4cc74112f41b26bd337f (diff) | |
| download | openshift-17760a76fb8578bba27439f86c432fa64d484d73.tar.gz openshift-17760a76fb8578bba27439f86c432fa64d484d73.tar.bz2 openshift-17760a76fb8578bba27439f86c432fa64d484d73.tar.xz openshift-17760a76fb8578bba27439f86c432fa64d484d73.zip | |
Merge pull request #2123 from sdodson/rhel-origin
Add CentOS PaaS SIG repos for RHEL
Diffstat (limited to 'roles/openshift_repos')
4 files changed, 63 insertions, 1 deletions
diff --git a/roles/openshift_repos/files/rhel-origin/RPM-GPG-KEY-CentOS-SIG-PaaS b/roles/openshift_repos/files/rhel-origin/RPM-GPG-KEY-CentOS-SIG-PaaS new file mode 100644 index 000000000..fcbaaca0e --- /dev/null +++ b/roles/openshift_repos/files/rhel-origin/RPM-GPG-KEY-CentOS-SIG-PaaS @@ -0,0 +1,20 @@ +-----BEGIN PGP PUBLIC KEY BLOCK----- +Version: GnuPG v2.0.22 (GNU/Linux) + +mQENBFc8iwUBCADadBGYmA2nFvq79/5uxUQOiPqC/QflWcPX1B6SQKniUhyqaSes +gNMJsPppKRV4NZKITcL8lZ90+Gds0fmL3b5xz1r5Rfm3ilSItEqeGlLIJZBvANyx +rAT3q8EgkkVRyhZPseUMZj04O8OKnt1jrHakVkOp0lJClqhZ+bs/7yLRmaLXTcum ++ouqUKzQoAEDnqe9nJmmJhC6n2vg7o0PCo/9qOf/scQbv4FNoJfmkcVLRmwmqzgh +bGj6QaOgij3sl94pZ3HFop4f+eU0kNbyt9J18fKI8X0DdHkDW8kO1UwwHT2ibJ1t +mBaUsE1zZ0DvfyFad1xXAgm+SIlJgdpPvPNLABEBAAG0WUNlbnRPUyBQYWFTIFNJ +RyAoaHR0cHM6Ly93aWtpLmNlbnRvcy5vcmcvU3BlY2lhbEludGVyZXN0R3JvdXAv +UGFhUykgPHNlY3VyaXR5QGNlbnRvcy5vcmc+iQE5BBMBAgAjBQJXPIsFAhsDBwsJ +CAcDAgEGFQgCCQoLBBYCAwECHgECF4AACgkQw0xb1C8pfsyT2gf9FqJoc8oZ+T5A +8cZslMyCWziPi0o7kd/Rw91T7dkV+VIC+sFlVga7fkPEAiD8U7JFE+a1IlcjfGuY +my4S6UH8K5zL36CRg2MF112HE5TWoBxF3KZg9nOJQ2NLapJowaP8uITYG4vlgV3g +GJD2OC191tjcqmelFnhAN0EBdxrRrBJ7tr3OCtL6bJ6NPQ0bXPI2Fjbm7SbxTfpE +ggEU8R7WZQApYgl8zRfyS12SfpFV8ZU+lIBmJaU1qaY4/BmNgG6e7clmq8xVZQLg +ZH9qi9+HPh+80+8/WhJUddlVXc2g6c4VjnnFpZfsrMdTAFuEsrjkyaxqeBjXCgbb +pzGjTg0LXg== +=CVSF +-----END PGP PUBLIC KEY BLOCK----- diff --git a/roles/openshift_repos/files/rhel-origin/repos/CentOS-OpenShift-Origin.repo b/roles/openshift_repos/files/rhel-origin/repos/CentOS-OpenShift-Origin.repo new file mode 100644 index 000000000..febe0cca0 --- /dev/null +++ b/roles/openshift_repos/files/rhel-origin/repos/CentOS-OpenShift-Origin.repo @@ -0,0 +1,28 @@ +[centos-openshift-origin] +name=CentOS OpenShift Origin +baseurl=http://mirror.centos.org/centos/7/paas/x86_64/openshift-origin/ +enabled=1 +gpgcheck=1 +gpgkey=file:///etc/pki/rpm-gpg/RPM-GPG-KEY-CentOS-SIG-PaaS + +[centos-openshift-origin-testing] +name=CentOS OpenShift Origin Testing +baseurl=http://buildlogs.centos.org/centos/7/paas/x86_64/openshift-origin/ +enabled=0 +gpgcheck=0 +gpgkey=file:///etc/pki/rpm-gpg/RPM-GPG-KEY-CentOS-SIG-PaaS + +[centos-openshift-origin-debuginfo] +name=CentOS OpenShift Origin DebugInfo +baseurl=http://debuginfo.centos.org/centos/7/paas/x86_64/ +enabled=0 +gpgcheck=1 +gpgkey=file:///etc/pki/rpm-gpg/RPM-GPG-KEY-CentOS-SIG-PaaS + +[centos-openshift-origin-source] +name=CentOS OpenShift Origin Source +baseurl=http://vault.centos.org/centos/7/paas/Source/openshift-origin/ +enabled=0 +gpgcheck=1 +gpgkey=file:///etc/pki/rpm-gpg/RPM-GPG-KEY-CentOS-SIG-PaaS + diff --git a/roles/openshift_repos/tasks/centos_sig.yaml b/roles/openshift_repos/tasks/centos_sig.yaml index 62cbef5db..60640d8a9 100644 --- a/roles/openshift_repos/tasks/centos_sig.yaml +++ b/roles/openshift_repos/tasks/centos_sig.yaml @@ -1,6 +1,20 @@ --- +- 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 f0b6ed7cb..32d66132e 100644 --- a/roles/openshift_repos/tasks/main.yaml +++ b/roles/openshift_repos/tasks/main.yaml @@ -81,4 +81,4 @@ - 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 == 'CentOS' + when: not openshift.common.is_containerized | bool and deployment_type == 'origin' and ansible_distribution != 'Fedora' |