diff options
| author | Devan Goodwin <dgoodwin@redhat.com> | 2016-07-14 16:04:01 -0300 |
|---|---|---|
| committer | Devan Goodwin <dgoodwin@redhat.com> | 2016-07-14 16:04:01 -0300 |
| commit | 03f31fdc581eea090388b5a60b3818167eb47c0c (patch) | |
| tree | 75a29846b763d24bf52c98f786ce1b6189c3a626 /roles/openshift_repos/files | |
| parent | 3073846a8c9e02af06d4d56f0141766b2337424b (diff) | |
| parent | faf5618ec483baa7618f02de91128e8f1eaaa471 (diff) | |
| download | openshift-03f31fdc581eea090388b5a60b3818167eb47c0c.tar.gz openshift-03f31fdc581eea090388b5a60b3818167eb47c0c.tar.bz2 openshift-03f31fdc581eea090388b5a60b3818167eb47c0c.tar.xz openshift-03f31fdc581eea090388b5a60b3818167eb47c0c.zip | |
Merge remote-tracking branch 'upstream/master' into upgrade33
Diffstat (limited to 'roles/openshift_repos/files')
| -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) | 9 |
2 files changed, 4 insertions, 5 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..124bff09d 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 @@ -3,26 +3,25 @@ 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 +gpgkey=file:///etc/pki/rpm-gpg/openshift-ansible-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 +gpgkey=file:///etc/pki/rpm-gpg/openshift-ansible-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 +gpgkey=file:///etc/pki/rpm-gpg/openshift-ansible-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 - +gpgkey=file:///etc/pki/rpm-gpg/openshift-ansible-CentOS-SIG-PaaS |