summaryrefslogtreecommitdiffstats
path: root/roles/repos/files
diff options
context:
space:
mode:
authorTroy Dawson <tdawson@redhat.com>2015-02-17 14:04:02 -0600
committerTroy Dawson <tdawson@redhat.com>2015-02-17 14:04:02 -0600
commit208af8ffec722622ab6dff428154ac3b00ca1434 (patch)
treeb9c5153beaa6563e9cd9a09e0eec97ea73287764 /roles/repos/files
parent5825d847da539256de3a7e4eef2dcbc38c198d0a (diff)
parentbcb257a6a68cf907afeb547e34d456f0351b45c2 (diff)
downloadopenshift-208af8ffec722622ab6dff428154ac3b00ca1434.tar.gz
openshift-208af8ffec722622ab6dff428154ac3b00ca1434.tar.bz2
openshift-208af8ffec722622ab6dff428154ac3b00ca1434.tar.xz
openshift-208af8ffec722622ab6dff428154ac3b00ca1434.zip
fixup oso-rhui repos
Diffstat (limited to 'roles/repos/files')
-rw-r--r--roles/repos/files/epel7-openshift.repo (renamed from roles/repos/files/epel7-origin.repo)0
-rw-r--r--roles/repos/files/oso-rhui-rhel-7-extras.repo19
-rw-r--r--roles/repos/files/oso-rhui-rhel-7-server.repo16
3 files changed, 24 insertions, 11 deletions
diff --git a/roles/repos/files/epel7-origin.repo b/roles/repos/files/epel7-openshift.repo
index c7629872d..c7629872d 100644
--- a/roles/repos/files/epel7-origin.repo
+++ b/roles/repos/files/epel7-openshift.repo
diff --git a/roles/repos/files/oso-rhui-rhel-7-extras.repo b/roles/repos/files/oso-rhui-rhel-7-extras.repo
index 3a7bfbb81..cfe41f691 100644
--- a/roles/repos/files/oso-rhui-rhel-7-extras.repo
+++ b/roles/repos/files/oso-rhui-rhel-7-extras.repo
@@ -1,10 +1,23 @@
-[oso-rhel-7-server-extras]
-name=Red Hat Enterprise Linux 7 Server - Extras from RHUI (RPMs)
+[oso-rhui-rhel-server-extras]
+name=OpenShift Online RHUI Mirror RH Enterprise Linux - Extras
baseurl=https://gce-mirror1.ops.rhcloud.com/libra/rhui-rhel-server-7-extras/
https://mirror.ops.rhcloud.com/libra/rhui-rhel-server-7-extras/
enabled=1
gpgcheck=1
-gpgkey=file:///etc/pki/rpm-gpg/RPM-GPG-KEY-redhat-release
+gpgkey=file:///etc/pki/rpm-gpg/RPM-GPG-KEY-redhat-release,file:///etc/pki/rpm-gpg/RPM-GPG-KEY-redhat-beta
+failovermethod=priority
+sslverify=False
sslclientcert=/var/lib/yum/client-cert.pem
sslclientkey=/var/lib/yum/client-key.pem
+
+[oso-rhui-rhel-server-extras-htb]
+name=OpenShift Online RHUI Mirror RH Enterprise Linux - Extras HTB
+baseurl=https://gce-mirror1.ops.rhcloud.com/libra/rhui-rhel-server-7-extras-htb/
+ https://mirror.ops.rhcloud.com/libra/rhui-rhel-server-7-extras-htb/
+enabled=0
+gpgcheck=1
+gpgkey=file:///etc/pki/rpm-gpg/RPM-GPG-KEY-redhat-release,file:///etc/pki/rpm-gpg/RPM-GPG-KEY-redhat-beta
+failovermethod=priority
sslverify=False
+sslclientcert=/var/lib/yum/client-cert.pem
+sslclientkey=/var/lib/yum/client-key.pem
diff --git a/roles/repos/files/oso-rhui-rhel-7-server.repo b/roles/repos/files/oso-rhui-rhel-7-server.repo
index 4773d0fe2..9fe4d6623 100644
--- a/roles/repos/files/oso-rhui-rhel-7-server.repo
+++ b/roles/repos/files/oso-rhui-rhel-7-server.repo
@@ -1,21 +1,21 @@
-[oso-rhel-7-server]
-name=Red Hat Enterprise Linux 7 Server from RHUI (RPMs)
+[oso-rhui-rhel-server-releases]
+name=OpenShift Online RHUI Mirror RH Enterprise Linux 7
baseurl=https://gce-mirror1.ops.rhcloud.com/libra/rhui-rhel-server-7-releases/
https://mirror.ops.rhcloud.com/libra/rhui-rhel-server-7-releases/
enabled=1
gpgcheck=1
-gpgkey=file:///etc/pki/rpm-gpg/RPM-GPG-KEY-redhat-release
+gpgkey=file:///srv/libra/keys/RPM-GPG-KEY-redhat-release
+sslverify=False
sslclientcert=/var/lib/yum/client-cert.pem
sslclientkey=/var/lib/yum/client-key.pem
-sslverify=False
-[oso-rhel-7-server-optional]
-name=Red Hat Enterprise Linux 7 Server - Optional from RHUI (RPMs)
+[oso-rhui-rhel-server-releases-optional]
+name=OpenShift Online RHUI Mirror RH Enterprise Linux 7 - Optional
baseurl=https://gce-mirror1.ops.rhcloud.com/libra/rhui-rhel-server-7-releases-optional/
https://mirror.ops.rhcloud.com/libra/rhui-rhel-server-7-releases-optional/
enabled=1
gpgcheck=1
-gpgkey=file:///etc/pki/rpm-gpg/RPM-GPG-KEY-redhat-release
+gpgkey=file:///srv/libra/keys/RPM-GPG-KEY-redhat-release
+sslverify=False
sslclientcert=/var/lib/yum/client-cert.pem
sslclientkey=/var/lib/yum/client-key.pem
-sslverify=False