diff options
| author | Jhon Honce <jhonce@redhat.com> | 2015-02-12 11:26:56 -0700 |
|---|---|---|
| committer | Jhon Honce <jhonce@redhat.com> | 2015-02-16 15:53:18 -0700 |
| commit | 7d74d1913274cba4c4732cbc5f0a573cb99e5248 (patch) | |
| tree | 91b943f553a4d37673e0dd32647528b4cd89ad1f /roles/repos | |
| parent | 65e50b4dd338a4757a2bfb883d34d803350c3aae (diff) | |
| download | openshift-7d74d1913274cba4c4732cbc5f0a573cb99e5248.tar.gz openshift-7d74d1913274cba4c4732cbc5f0a573cb99e5248.tar.bz2 openshift-7d74d1913274cba4c4732cbc5f0a573cb99e5248.tar.xz openshift-7d74d1913274cba4c4732cbc5f0a573cb99e5248.zip | |
- Rename minion to node
- Update playbooks to support latest code
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-server.repo | 48 | ||||
| -rw-r--r-- | roles/repos/tasks/main.yaml | 5 |
3 files changed, 44 insertions, 9 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-server.repo b/roles/repos/files/oso-rhui-rhel-7-server.repo index d32070634..fa182cb0a 100644 --- a/roles/repos/files/oso-rhui-rhel-7-server.repo +++ b/roles/repos/files/oso-rhui-rhel-7-server.repo @@ -1,13 +1,45 @@ -[oso-rhel-7-server] -name=Red Hat Enterprise Linux 7 Server from RHUI (RPMs) -baseurl=http://10.240.169.148/mirror/rhui-rhel-server-7-releases +[oso-rhui-rhel-server-releases] +name=OpenShift Online RHUI Mirror RH Enterprise Linux $majorrelease +baseurl=https://gce-mirror1.ops.rhcloud.com/libra/rhui-rhel-server-$majorrelease-releases/ + https://mirror.ops.rhcloud.com/libra/rhui-rhel-server-$majorrelease-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 -[oso-rhel-7-server-optional] -name=Red Hat Enterprise Linux 7 Server - Optional from RHUI (RPMs) -baseurl=http://10.240.169.148/mirror/rhui-rhel-server-7-releases-optional +[oso-rhui-rhel-server-releases-optional] +name=OpenShift Online RHUI Mirror RH Enterprise Linux $majorrelease - Optional +baseurl=https://gce-mirror1.ops.rhcloud.com/libra/rhui-rhel-server-$majorrelease-releases-optional/ + https://mirror.ops.rhcloud.com/libra/rhui-rhel-server-$majorrelease-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 + +[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-$majorrelease-extras/ + https://mirror.ops.rhcloud.com/libra/rhui-rhel-server-$majorrelease-extras/ +enabled=1 +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 + +[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-$majorrelease-extras-htb/ + https://mirror.ops.rhcloud.com/libra/rhui-rhel-server-$majorrelease-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/tasks/main.yaml b/roles/repos/tasks/main.yaml index 3b66bb392..cb4b5ad40 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 |