Update abbey to use some of the logic in ansible-bootstrap.sh.

util/vpc-tools/abbey.py

@@ -302,14 +302,132 @@ export ANSIBLE_ENABLE_SQS SQS_NAME SQS_REGION SQS_MSG_PREFIX PYTHONUNBUFFERED
 export HIPCHAT_TOKEN HIPCHAT_ROOM HIPCHAT_MSG_PREFIX HIPCHAT_FROM
 export HIPCHAT_MSG_COLOR DATADOG_API_KEY
 
-if [[ ! -x /usr/bin/git || ! -x /usr/bin/pip ]]; then
-    echo "Installing pkg dependencies"
-    /usr/bin/apt-get update
-    /usr/bin/apt-get install -y git python-pip python-apt \\
-        git-core build-essential python-dev libxml2-dev \\
-        libxslt-dev curl libmysqlclient-dev libffi-dev libssl-dev --force-yes
+
+# Lifted from ansible-bootstrap.sh
+
+set -xe
+
+if [[ -z "${ANSIBLE_REPO}" ]]; then
+  ANSIBLE_REPO="https://github.com/edx/ansible.git"
+fi
+
+if [[ -z "${ANSIBLE_VERSION}" ]]; then
+  ANSIBLE_VERSION="master"
+fi
+
+if [[ -z "${CONFIGURATION_REPO}" ]]; then
+  CONFIGURATION_REPO="https://github.com/edx/configuration.git"
+fi
+
+if [[ -z "${CONFIGURATION_VERSION}" ]]; then
+  CONFIGURATION_VERSION="master"
+fi
+
+if [[ -z "${UPGRADE_OS}" ]]; then
+  UPGRADE_OS=false
+fi
+
+#
+# Bootstrapping constants
+#
+VIRTUAL_ENV_VERSION="15.0.2"
+PIP_VERSION="8.1.2"
+SETUPTOOLS_VERSION="24.0.3"
+EDX_PPA="deb http://ppa.edx.org precise main"
+EDX_PPA_KEY_SERVER="hkp://pgp.mit.edu:80"
+EDX_PPA_KEY_ID="69464050"
+
+cat << EOF
+******************************************************************************
+
+Running the abbey with the following arguments:
+
+ANSIBLE_REPO="${ANSIBLE_REPO}"
+ANSIBLE_VERSION="${ANSIBLE_VERSION}"
+CONFIGURATION_REPO="${CONFIGURATION_REPO}"
+CONFIGURATION_VERSION="${CONFIGURATION_VERSION}"
+
+******************************************************************************
+EOF
+
+
+if [[ $(id -u) -ne 0 ]] ;then
+    echo "Please run as root";
+    exit 1;
 fi
 
+if grep -q 'Precise Pangolin' /etc/os-release
+then
+    SHORT_DIST="precise"
+elif grep -q 'Trusty Tahr' /etc/os-release
+then
+    SHORT_DIST="trusty"
+elif grep -q 'Xenial Xerus' /etc/os-release
+then
+    SHORT_DIST="xenial"
+else
+    cat << EOF
+
+    This script is only known to work on Ubuntu Precise, Trusty and Xenial,
+    exiting.  If you are interested in helping make installation possible
+    on other platforms, let us know.
+
+EOF
+   exit 1;
+fi
+
+EDX_PPA="deb http://ppa.edx.org ${SHORT_DIST} main"
+
+# Upgrade the OS
+apt-get update -y
+apt-key update -y
+
+if [ "${UPGRADE_OS}" = true ]; then
+    echo "Upgrading the OS..."
+    apt-get upgrade -y
+fi
+
+# Required for add-apt-repository
+apt-get install -y software-properties-common python-software-properties
+
+# Add git PPA
+add-apt-repository -y ppa:git-core/ppa
+
+# For older distributions we need to install a PPA for Python 2.7.10
+if [[ "precise" = "${SHORT_DIST}" || "trusty" = "${SHORT_DIST}" ]]; then
+
+    # Add python PPA
+    apt-key adv --keyserver "${EDX_PPA_KEY_SERVER}" --recv-keys "${EDX_PPA_KEY_ID}"
+    add-apt-repository -y "${EDX_PPA}"
+fi
+
+# Install python 2.7 latest, git and other common requirements
+# NOTE: This will install the latest version of python 2.7 and
+# which may differ from what is pinned in virtualenvironments
+apt-get update -y
+
+apt-get install -y python2.7 python2.7-dev python-pip python-apt python-yaml python-jinja2 build-essential sudo git-core libmysqlclient-dev libffi-dev libssl-dev
+
+# Workaround for a 16.04 bug, need to upgrade to latest and then
+# potentially downgrade to the preferred version.
+# https://github.com/pypa/pip/issues/3862
+if [[ "xenial" = "${SHORT_DIST}" ]]; then
+    pip install --upgrade pip
+    pip install --upgrade pip=="${PIP_VERSION}"
+else
+    pip install --upgrade pip=="${PIP_VERSION}"
+fi
+
+# pip moves to /usr/local/bin when upgraded
+hash -r   #pip may have moved from /usr/bin/ to /usr/local/bin/. This clears bash's path cache.
+PATH=/usr/local/bin:${PATH}
+pip install setuptools=="${SETUPTOOLS_VERSION}"
+pip install virtualenv=="${VIRTUAL_ENV_VERSION}"
+
+
+##################### END Lifted from ansible-bootstrap.sh
+
+
 # python3 is required for certain other things
 # (currently xqwatcher so it can run python2 and 3 grader code,
 # but potentially more in the future). It's not available on Ubuntu 12.04,
@@ -324,15 +442,6 @@ fi
 # only runs on a build from scratch
 /usr/bin/apt-get install -y python-httplib2 --force-yes
 
-# Must upgrade to latest before pinning to work around bug
-# https://github.com/pypa/pip/issues/3862
-pip install --upgrade pip
-hash -r   #pip may have moved from /usr/bin/ to /usr/local/bin/. This clears bash's path cache.
-pip install --upgrade pip==8.1.2
-
-# upgrade setuptools early to avoid no distribution errors
-pip install --upgrade setuptools==24.0.3
-
 rm -rf $base_dir
 mkdir -p $base_dir
 cd $base_dir