From 7d1481eba39c61c51708e42c9bfe043e6d789d06 Mon Sep 17 00:00:00 2001
From: Jason DeTiberus <jdetiber@redhat.com>
Date: Wed, 30 Mar 2016 21:11:26 -0400
Subject: Switch to using CentOS SIG repos for Origin installs

---
 roles/openshift_repos/files/origin/repos/centos-origin.repo        | 5 +++++
 .../files/origin/repos/maxamillion-origin-next-epel-7.repo         | 7 -------
 .../files/removed/repos/maxamillion-origin-next-epel-7.repo        | 7 +++++++
 3 files changed, 12 insertions(+), 7 deletions(-)
 create mode 100644 roles/openshift_repos/files/origin/repos/centos-origin.repo
 delete mode 100644 roles/openshift_repos/files/origin/repos/maxamillion-origin-next-epel-7.repo
 create mode 100644 roles/openshift_repos/files/removed/repos/maxamillion-origin-next-epel-7.repo

(limited to 'roles/openshift_repos/files')

diff --git a/roles/openshift_repos/files/origin/repos/centos-origin.repo b/roles/openshift_repos/files/origin/repos/centos-origin.repo
new file mode 100644
index 000000000..169c5d8a5
--- /dev/null
+++ b/roles/openshift_repos/files/origin/repos/centos-origin.repo
@@ -0,0 +1,5 @@
+[centos-openshift-origin]
+name=CentOS OpenShift Origin
+baseurl=http://mirror.centos.org/centos/7/paas/x86_64/openshift-origin/
+enabled=1
+gpgcheck=1
diff --git a/roles/openshift_repos/files/origin/repos/maxamillion-origin-next-epel-7.repo b/roles/openshift_repos/files/origin/repos/maxamillion-origin-next-epel-7.repo
deleted file mode 100644
index 0b21e0a65..000000000
--- a/roles/openshift_repos/files/origin/repos/maxamillion-origin-next-epel-7.repo
+++ /dev/null
@@ -1,7 +0,0 @@
-[maxamillion-origin-next]
-name=Copr repo for origin-next owned by maxamillion
-baseurl=https://copr-be.cloud.fedoraproject.org/results/maxamillion/origin-next/epel-7-$basearch/
-skip_if_unavailable=True
-gpgcheck=1
-gpgkey=https://copr-be.cloud.fedoraproject.org/results/maxamillion/origin-next/pubkey.gpg
-enabled=1
diff --git a/roles/openshift_repos/files/removed/repos/maxamillion-origin-next-epel-7.repo b/roles/openshift_repos/files/removed/repos/maxamillion-origin-next-epel-7.repo
new file mode 100644
index 000000000..0b21e0a65
--- /dev/null
+++ b/roles/openshift_repos/files/removed/repos/maxamillion-origin-next-epel-7.repo
@@ -0,0 +1,7 @@
+[maxamillion-origin-next]
+name=Copr repo for origin-next owned by maxamillion
+baseurl=https://copr-be.cloud.fedoraproject.org/results/maxamillion/origin-next/epel-7-$basearch/
+skip_if_unavailable=True
+gpgcheck=1
+gpgkey=https://copr-be.cloud.fedoraproject.org/results/maxamillion/origin-next/pubkey.gpg
+enabled=1
-- 
cgit v1.2.3


From 72421b3f6afd8a1e11ab0f3f05f62fdbb3e6cf18 Mon Sep 17 00:00:00 2001
From: Jason DeTiberus <jdetiber@redhat.com>
Date: Wed, 18 May 2016 14:14:59 -0400
Subject: temporarily disable gpg checking until we have a way to cleanly
 enable it

---
 roles/openshift_repos/files/origin/repos/centos-origin.repo | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'roles/openshift_repos/files')

diff --git a/roles/openshift_repos/files/origin/repos/centos-origin.repo b/roles/openshift_repos/files/origin/repos/centos-origin.repo
index 169c5d8a5..77c0c7c71 100644
--- a/roles/openshift_repos/files/origin/repos/centos-origin.repo
+++ b/roles/openshift_repos/files/origin/repos/centos-origin.repo
@@ -2,4 +2,4 @@
 name=CentOS OpenShift Origin
 baseurl=http://mirror.centos.org/centos/7/paas/x86_64/openshift-origin/
 enabled=1
-gpgcheck=1
+gpgcheck=0
-- 
cgit v1.2.3


From 3db5216866ca67e204b14f9f0e314485eecd5647 Mon Sep 17 00:00:00 2001
From: Jason DeTiberus <jdetiber@redhat.com>
Date: Thu, 26 May 2016 17:08:01 -0400
Subject: switch to using sig release packages

---
 roles/openshift_repos/files/origin/repos/centos-origin.repo | 5 -----
 1 file changed, 5 deletions(-)
 delete mode 100644 roles/openshift_repos/files/origin/repos/centos-origin.repo

(limited to 'roles/openshift_repos/files')

diff --git a/roles/openshift_repos/files/origin/repos/centos-origin.repo b/roles/openshift_repos/files/origin/repos/centos-origin.repo
deleted file mode 100644
index 77c0c7c71..000000000
--- a/roles/openshift_repos/files/origin/repos/centos-origin.repo
+++ /dev/null
@@ -1,5 +0,0 @@
-[centos-openshift-origin]
-name=CentOS OpenShift Origin
-baseurl=http://mirror.centos.org/centos/7/paas/x86_64/openshift-origin/
-enabled=1
-gpgcheck=0
-- 
cgit v1.2.3