Browse code
Move to download.fedoraproject.org
download.fedoraproject.org is the mirror system, while
dl.fedoraproject.org is just one system. We have seen performance issues
with dl.fedoraproject.org and using download.fedoraproject.org was a
recommended as a solution by the folks at #fedora-admin.
Local testing on a rackspace server with dl.fedoraproject.org got about
70K/s while download.fedoraproject.org got over 1M/s
Note this is not a cherry-pick of I318d8844cfcfbc42c1e552e443c6b793d20f321f, because that wouldn't work
Change-Id: Ic68efcef0ed62f7867114d6992aee1610d6e8eb9
Related-Bug: #1383928
Joe Gordon authored on 2014/10/24 02:59:42Showing 2 changed files
| ... | ... |
@@ -230,9 +230,9 @@ if [[ is_fedora && $DISTRO =~ (rhel) ]]; then |
| 230 | 230 |
fi |
| 231 | 231 |
# RHEL requires EPEL for many Open Stack dependencies |
| 232 | 232 |
if [[ $DISTRO =~ (rhel7) ]]; then |
| 233 |
- EPEL_RPM=${RHEL7_EPEL_RPM:-"http://dl.fedoraproject.org/pub/epel/beta/7/x86_64/epel-release-7-0.1.noarch.rpm"}
|
|
| 233 |
+ EPEL_RPM=${RHEL7_EPEL_RPM:-"http://download.fedoraproject.org/pub/epel/beta/7/x86_64/epel-release-7-0.1.noarch.rpm"}
|
|
| 234 | 234 |
else |
| 235 |
- EPEL_RPM=${RHEL6_EPEL_RPM:-"http://dl.fedoraproject.org/pub/epel/6/x86_64/epel-release-6-8.noarch.rpm"}
|
|
| 235 |
+ EPEL_RPM=${RHEL6_EPEL_RPM:-"http://download.fedoraproject.org/pub/epel/6/x86_64/epel-release-6-8.noarch.rpm"}
|
|
| 236 | 236 |
fi |
| 237 | 237 |
if ! sudo yum repolist enabled epel | grep -q 'epel'; then |
| 238 | 238 |
echo "EPEL not detected; installing" |
| ... | ... |
@@ -348,8 +348,8 @@ esac |
| 348 | 348 |
# TODO(sdague) this next block can be removed after nodepool has the 64bit image in it's cache |
| 349 | 349 |
HEAT_FETCHED_TEST_IMAGE=${HEAT_FETCHED_TEST_IMAGE:-""}
|
| 350 | 350 |
if [[ "$HEAT_FETCHED_TEST_IMAGE" == "Fedora-i386-20-20131211.1-sda" ]]; then |
| 351 |
- HEAT_CFN_IMAGE_URL="https://dl.fedoraproject.org/pub/fedora/linux/releases/20/Images/i386/$HEAT_FETCHED_TEST_IMAGE.qcow2" |
|
| 352 |
- IMAGE_URLS+=",https://dl.fedoraproject.org/pub/fedora/linux/releases/20/Images/i386/$HEAT_FETCHED_TEST_IMAGE.qcow2" |
|
| 351 |
+ HEAT_CFN_IMAGE_URL="https://download.fedoraproject.org/pub/fedora/linux/releases/20/Images/i386/$HEAT_FETCHED_TEST_IMAGE.qcow2" |
|
| 352 |
+ IMAGE_URLS+=",https://download.fedoraproject.org/pub/fedora/linux/releases/20/Images/i386/$HEAT_FETCHED_TEST_IMAGE.qcow2" |
|
| 353 | 353 |
elif [[ "$HEAT_FETCHED_TEST_IMAGE" == "Fedora-x86_64-20-20131211.1-sda" ]]; then |
| 354 | 354 |
HEAT_CFN_IMAGE_URL="https://download.fedoraproject.org/pub/fedora/linux/releases/20/Images/x86_64/Fedora-x86_64-20-20131211.1-sda.qcow2" |
| 355 | 355 |
IMAGE_URLS+=",https://download.fedoraproject.org/pub/fedora/linux/releases/20/Images/x86_64/Fedora-x86_64-20-20131211.1-sda.qcow2" |