Remove crankcase patch since fix was merged upstream

Added a patch to force yum to retry indefinately on crankcase builds
because the OpenShift repositories were too busy.  I submitted this upstream
in:

  https://github.com/openshift/crankcase/pull/336

and it was merged.

As a result, removing this workaround.

Change-Id: I26e0a162d5cfb4bc23843c93678318ff21610973
Signed-off-by: Steven Dake <sdake@redhat.com>

diff --git a/templates/OpenShift.template b/templates/OpenShift.template
index e169b8d3d1324d7fc052834df4e12c28c7adcb13..9f697f10e6e32020f37b77c189bd172fddba9d78 100644 (file)
--- a/templates/OpenShift.template
+++ b/templates/OpenShift.template
@@ -62,65 +62,6 @@
       "Metadata" : {
         "AWS::CloudFormation::Init" : {
           "config" : {
-            "files": {
-              "/tmp/openshift-patch-rakefile.patch": {
-                "content": { "Fn::Join": ["", [
-"diff --git a/build/Rakefile b/build/Rakefile\n",
-"index 358ba25..ce82162 100644\n",
-"--- a/build/Rakefile\n",
-"+++ b/build/Rakefile\n",
-"@@ -22,18 +22,21 @@ name    = local_build\n",
-" baseurl = file://#{rpmdir}/noarch\n",
-" gpgcheck= 0\n",
-" enabled = 1\n",
-"+retries = 0\n",
-"\n",
-" [openshift_origin]\n",
-" name    = openshift_origin\n",
-" baseurl = http://mirror.openshift.com/pub/crankcase/fedora-$releasever/$basearch\n",
-" gpgcheck= 0\n",
-" enabled = 1\n",
-"+retries = 0\n",
-"\n",
-" [fedora_ruby]\n",
-" name    = openshift_origin\n",
-" baseurl = http://mirror.openshift.com/pub/fedora-ruby/$basearch\n",
-" gpgcheck= 0\n",
-" enabled = 1\n",
-"+retries = 0\n",
-"\n",
-" [openshift]\n",
-" name=Openshift\n",
-"@@ -44,6 +47,7 @@ gpgkey=https://openshift.redhat.com/app/repo/RPM-GPG-KEY-redhat-beta\n",
-" ggpkey=https://openshift.redhat.com/app/repo/RPM-GPG-KEY-redhat-release\n",
-" enabled=1\n",
-" gpgcheck=1\n",
-"+retries = 0\n",
-"   EOF\n",
-"   else\n",
-"   <<-EOF\n",
-"@@ -52,12 +56,14 @@ name    = local_build\n",
-" baseurl = file://#{rpmdir}/noarch\n",
-" gpgcheck= 0\n",
-" enabled = 1\n",
-"+retries = 0\n",
-"\n",
-" [openshift_origin]\n",
-" name    = openshift_origin\n",
-" baseurl = http://mirror.openshift.com/pub/crankcase/rhel-6/$basearch\n",
-" gpgcheck= 0\n",
-" enabled = 1\n",
-"+retries = 0\n",
-"   EOF\n",
-"   end\n",
-" end\n"
-                ]]},
-                "mode": "000644",
-                "owner": "root",
-                "group": "root"
-            }
-          },
-
             "packages" : {
               "yum" : {
                 "ntp"                      : [],