openstack/heat
Code Issues Proposed changes

Remove crankcase patch since fix was merged upstream

Browse Source 
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>
This commit is contained in:
Steven Dake 2012-08-08 14:58:51 -07:00
parent ec45dd77c0
commit 69cfc124bc
1 changed files with 0 additions and 59 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

59
templates/OpenShift.template
View File

@ -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" : [],