diff options
| author | Troy Dawson <tdawson@redhat.com> | 2015-02-17 08:37:32 -0600 |
|---|---|---|
| committer | Troy Dawson <tdawson@redhat.com> | 2015-02-17 09:00:11 -0600 |
| commit | 5825d847da539256de3a7e4eef2dcbc38c198d0a (patch) | |
| tree | 0a5d9b1c8f6b74ece023bb85535ba5cd82ba7e49 | |
| parent | 9fed3621012fa21e87e46c704904895bf26cfa1f (diff) | |
| download | openshift-5825d847da539256de3a7e4eef2dcbc38c198d0a.tar.gz openshift-5825d847da539256de3a7e4eef2dcbc38c198d0a.tar.bz2 openshift-5825d847da539256de3a7e4eef2dcbc38c198d0a.tar.xz openshift-5825d847da539256de3a7e4eef2dcbc38c198d0a.zip | |
remove the add-hoc docker repo
Fix up libra candidate repo config file
Fix up rhel 7 rhui repo config file
Add rhel 7 rhui extras repo, which has docker in it
Separate rhel 7 extras into its own config file
Add rhel 7 extras so that we have docker
| -rw-r--r-- | roles/repos/files/docker.repo | 5 | ||||
| -rw-r--r-- | roles/repos/files/oso-rhui-rhel-7-extras.repo | 10 | ||||
| -rw-r--r-- | roles/repos/files/oso-rhui-rhel-7-server.repo | 12 | ||||
| -rw-r--r-- | roles/repos/files/rhel-7-libra-candidate.repo | 5 | ||||
| -rw-r--r-- | roles/repos/tasks/main.yaml | 4 |
5 files changed, 25 insertions, 11 deletions
diff --git a/roles/repos/files/docker.repo b/roles/repos/files/docker.repo deleted file mode 100644 index 5722284f5..000000000 --- a/roles/repos/files/docker.repo +++ /dev/null @@ -1,5 +0,0 @@ -[docker] -name= Temporary Docker rpm -baseurl=http://10.240.169.148/mirror/docker -gpgcheck=0 -enabled=0 diff --git a/roles/repos/files/oso-rhui-rhel-7-extras.repo b/roles/repos/files/oso-rhui-rhel-7-extras.repo new file mode 100644 index 000000000..3a7bfbb81 --- /dev/null +++ b/roles/repos/files/oso-rhui-rhel-7-extras.repo @@ -0,0 +1,10 @@ +[oso-rhel-7-server-extras] +name=Red Hat Enterprise Linux 7 Server - Extras from RHUI (RPMs) +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 +sslclientcert=/var/lib/yum/client-cert.pem +sslclientkey=/var/lib/yum/client-key.pem +sslverify=False diff --git a/roles/repos/files/oso-rhui-rhel-7-server.repo b/roles/repos/files/oso-rhui-rhel-7-server.repo index d32070634..4773d0fe2 100644 --- a/roles/repos/files/oso-rhui-rhel-7-server.repo +++ b/roles/repos/files/oso-rhui-rhel-7-server.repo @@ -1,13 +1,21 @@ [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 +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 +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) -baseurl=http://10.240.169.148/mirror/rhui-rhel-server-7-releases-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 +sslclientcert=/var/lib/yum/client-cert.pem +sslclientkey=/var/lib/yum/client-key.pem +sslverify=False diff --git a/roles/repos/files/rhel-7-libra-candidate.repo b/roles/repos/files/rhel-7-libra-candidate.repo index 0901bf707..b4215679f 100644 --- a/roles/repos/files/rhel-7-libra-candidate.repo +++ b/roles/repos/files/rhel-7-libra-candidate.repo @@ -1,7 +1,8 @@ [rhel-7-libra-candidate] name=rhel-7-libra-candidate - \$basearch -baseurl=https://mirror1.ops.rhcloud.com/libra/rhel-7-libra-candidate/\$basearch/ -gpgkey=https://mirror1.ops.rhcloud.com/libra/RPM-GPG-KEY-redhat-release https://mirror1.ops.rhcloud.com/libra/RPM-GPG-KEY-redhat-beta https://mirror1.ops.rhcloud.com/libra/RPM-GPG-KEY-redhat-openshifthosted +baseurl=https://gce-mirror1.ops.rhcloud.com/libra/rhel-7-libra-candidate/\$basearch/ + https://mirror.ops.rhcloud.com/libra/rhel-7-libra-candidate/\$basearch/ +gpgkey=https://mirror.ops.rhcloud.com/libra/RPM-GPG-KEY-redhat-openshifthosted skip_if_unavailable=True gpgcheck=0 enabled=1 diff --git a/roles/repos/tasks/main.yaml b/roles/repos/tasks/main.yaml index 3b66bb392..e5c9a7f92 100644 --- a/roles/repos/tasks/main.yaml +++ b/roles/repos/tasks/main.yaml @@ -3,8 +3,8 @@ - name: Ensure rhel 7 libra candidate exists in yum.repos.d copy: src=rhel-7-libra-candidate.repo dest=/etc/yum.repos.d/rhel-7-libra-candidate.repo -- name: Ensure a docker repo is laid down - copy: src=docker.repo dest=/etc/yum.repos.d/docker.repo +- name: Ensure rhel 7 extras exists in yum.repos.d + copy: src=oso-rhui-rhel-7-extras.repo dest=/etc/yum.repos.d/oso-rhui-rhel-7-extras.repo - name: Ensure the kubernetes repo is available copy: src=epel7-kubernetes.repo dest=/etc/yum.repos.d/epel7-kubernetes.repo |