Commit 2904a6f7 by Fred Smith

Merge pull request #2231 from xiangjf/master

Installation Script: Fix configuration version bug and update to make use of the latest pip's cache feature
parents 16639285 1582d85b
...@@ -45,3 +45,4 @@ Jonathan Peter <jonathan.peter@blue-planet-life.org> ...@@ -45,3 +45,4 @@ Jonathan Peter <jonathan.peter@blue-planet-life.org>
Kevin Falcone <kevin@edx.org> Kevin Falcone <kevin@edx.org>
Max Rothman <max@edx.org> Max Rothman <max@edx.org>
Andy Armstrong <andya@edx.org> Andy Armstrong <andya@edx.org>
Xiang Junfu <xiangjf.fnst@cn.fujitsu.com>
...@@ -27,7 +27,7 @@ sudo apt-get upgrade -y ...@@ -27,7 +27,7 @@ sudo apt-get upgrade -y
## ##
sudo apt-get install -y build-essential software-properties-common python-software-properties curl git-core libxml2-dev libxslt1-dev python-pip python-apt python-dev sudo apt-get install -y build-essential software-properties-common python-software-properties curl git-core libxml2-dev libxslt1-dev python-pip python-apt python-dev
sudo pip install --upgrade pip sudo pip install --upgrade pip
sudo pip install --upgrade virtualenv sudo -H pip install --upgrade virtualenv
## Did we specify an openedx release? ## Did we specify an openedx release?
if [ -n "$OPENEDX_RELEASE" ]; then if [ -n "$OPENEDX_RELEASE" ]; then
...@@ -35,6 +35,7 @@ if [ -n "$OPENEDX_RELEASE" ]; then ...@@ -35,6 +35,7 @@ if [ -n "$OPENEDX_RELEASE" ]; then
-e certs_version=$OPENEDX_RELEASE \ -e certs_version=$OPENEDX_RELEASE \
-e forum_version=$OPENEDX_RELEASE \ -e forum_version=$OPENEDX_RELEASE \
-e xqueue_version=$OPENEDX_RELEASE \ -e xqueue_version=$OPENEDX_RELEASE \
-e configuration_version=$OPENEDX_RELEASE \
" "
CONFIG_VER=$OPENEDX_RELEASE CONFIG_VER=$OPENEDX_RELEASE
else else
...@@ -53,7 +54,7 @@ git checkout $CONFIG_VER ...@@ -53,7 +54,7 @@ git checkout $CONFIG_VER
## Install the ansible requirements ## Install the ansible requirements
## ##
cd /var/tmp/configuration cd /var/tmp/configuration
sudo pip install -r requirements.txt sudo -H pip install -r requirements.txt
## ##
## Run the edx_sandbox.yml playbook in the configuration/playbooks directory ## Run the edx_sandbox.yml playbook in the configuration/playbooks directory
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment