openstack/rally
Code Issues Proposed changes

Use wget instead of curl in install script

Browse Source 
Some linux distributions have buggy curl versions, which
incorrect hande redirects.

Change-Id: Ice79958096240446955eb92517dfd41ce9432a5f
Closes-Bug: #1335117
This commit is contained in:
Sergey Skripnick
2014-06-27 16:13:27 +03:00
parent b16c73c9b7
commit eb4104188d
1 changed files with 4 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
install_rally.sh
View File

@@ -70,14 +70,14 @@ init_variables() {
} }
install_rhel_based_system_requirements() { install_rhel_based_system_requirements() {
local install_rally_dependencies='curl' local install_rally_dependencies='wget'
local cryptography_dependencies='gcc libffi-devel python-devel openssl-devel gmp-devel' local cryptography_dependencies='gcc libffi-devel python-devel openssl-devel gmp-devel'
local external_dependencies='libxml2-devel libxslt-devel' # dependencies from projects, which are used by rally local external_dependencies='libxml2-devel libxslt-devel' # dependencies from projects, which are used by rally
yum -y install ${install_rally_dependencies} ${cryptography_dependencies} ${external_dependencies} yum -y install ${install_rally_dependencies} ${cryptography_dependencies} ${external_dependencies}
} }
install_debian_based_system_requirements() { install_debian_based_system_requirements() {
local install_rally_dependencies='curl' local install_rally_dependencies='wget'
local cryptography_dependencies='build-essential libssl-dev libffi-dev python-dev' local cryptography_dependencies='build-essential libssl-dev libffi-dev python-dev'
local external_dependencies='libxml2-dev libxslt1-dev' # dependencies from projects, which are used by rally local external_dependencies='libxml2-dev libxslt1-dev' # dependencies from projects, which are used by rally
apt-get -y install ${install_rally_dependencies} ${cryptography_dependencies} ${external_dependencies} apt-get -y install ${install_rally_dependencies} ${cryptography_dependencies} ${external_dependencies}
@@ -87,7 +87,7 @@ unsupported_os_system_requirements() {
echo "Your system is currently unsupported by this installation script." echo "Your system is currently unsupported by this installation script."
echo "Currently supported systems: RHEL-based, Debian-based." echo "Currently supported systems: RHEL-based, Debian-based."
echo "If you want to proceed, first install manually the following dependencies:" echo "If you want to proceed, first install manually the following dependencies:"
echo "gcc, libffi-devel, python-devel, openssl-devel, curl" echo "gcc, libffi-devel, python-devel, openssl-devel, wget"
while true; do while true; do
read -p "Do you want to proceed with the installation of Rally? [Y/n]: " ans read -p "Do you want to proceed with the installation of Rally? [Y/n]: " ans
case ${ans} in case ${ans} in
@@ -111,7 +111,7 @@ install_system_requirements() {
fi fi
if ! hash pip 2> /dev/null; then if ! hash pip 2> /dev/null; then
curl -L -o ${GETPIPPY_FILE} ${PIP_SECURE_LOCATION} wget -O ${GETPIPPY_FILE} ${PIP_SECURE_LOCATION}
python ${GETPIPPY_FILE} python ${GETPIPPY_FILE}
fi fi
} }