diff --git a/tools/install_rally.sh b/install_rally.sh similarity index 97% rename from tools/install_rally.sh rename to install_rally.sh index c8c1be80be..f120294a40 100755 --- a/tools/install_rally.sh +++ b/install_rally.sh @@ -57,7 +57,6 @@ init_variables() { PIP_SECURE_LOCATION="https://raw.github.com/pypa/pip/master/contrib/get-pip.py" TMP="`dirname \"$0\"`" TMP="`( cd \"${TMP}\" && pwd )`" - RALLY_GIT=${TMP%/*} if [ "${scope}" = "system" ]; then RALLY_DATABASE_DIR="/var/lib/rally/database" @@ -127,13 +126,13 @@ install_rally_requirements() { } install_rally() { - cd ${RALLY_GIT} + cd ${TMP} python setup.py install } configure_rally() { mkdir -p ${RALLY_DATABASE_DIR} ${RALLY_CONFIGURATION_DIR} - cp ${RALLY_GIT}/etc/rally/rally.conf.sample ${RALLY_CONFIGURATION_DIR}/rally.conf + cp ${TMP}/etc/rally/rally.conf.sample ${RALLY_CONFIGURATION_DIR}/rally.conf sed -i "/#connection=/a connection=sqlite:////${RALLY_DATABASE_DIR}/rally.sqlite" ${RALLY_CONFIGURATION_DIR}/rally.conf rally-manage db recreate diff --git a/tests_ci/test_install.sh b/tests_ci/test_install.sh index a69e8cf04c..78666a76b2 100755 --- a/tests_ci/test_install.sh +++ b/tests_ci/test_install.sh @@ -16,5 +16,5 @@ # under the License. -sudo tools/install_rally.sh +sudo ./install_rally.sh rally deployment list