diff options
Diffstat (limited to 'roles/repos')
| -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.repo | 19 | ||||
| -rw-r--r-- | roles/repos/files/oso-rhui-rhel-7-server.repo | 16 | ||||
| -rw-r--r-- | roles/repos/tasks/main.yaml | 5 |
4 files changed, 28 insertions, 12 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 diff --git a/roles/repos/tasks/main.yaml b/roles/repos/tasks/main.yaml index e5c9a7f92..a6a80581e 100644 --- a/roles/repos/tasks/main.yaml +++ b/roles/repos/tasks/main.yaml @@ -10,4 +10,7 @@ copy: src=epel7-kubernetes.repo dest=/etc/yum.repos.d/epel7-kubernetes.repo - name: Ensure the origin repo is available - copy: src=epel7-origin.repo dest=/etc/yum.repos.d/epel7-origin.repo + copy: src=epel7-openshift.repo dest=/etc/yum.repos.d/epel7-openshift.repo + +- name: Ensure the rhel repo is available + copy: src=oso-rhui-rhel-7-server.repo dest=/etc/yum.repos.d/oso-rhui-rhel-7-server.repo |