diff --git a/scripts/env-setup.sh b/scripts/env-setup.sh
index e2c62eba0..adf641648 100755
--- a/scripts/env-setup.sh
+++ b/scripts/env-setup.sh
@@ -1,222 +1,12 @@
 #!/bin/bash
 set -eu
 
-ANSIBLE_GIT_URL=${ANSIBLE_GIT_URL:-https://github.com/ansible/ansible.git}
-ANSIBLE_GIT_BRANCH=${ANSIBLE_GIT_BRANCH:-stable-2.1}
-ANSIBLE_INSTALL_ROOT=${ANSIBLE_INSTALL_ROOT:-/opt/stack}
+ANSIBLE_FROM_PYPI=${ANSIBLE_FROM_PYPI:-"False"}
 
-function check_get_module () {
-    local file=${1}
-    local url=${2}
-    if [ ! -e ${file} ]; then
-        wget -O ${file} ${url}
-    fi
-}
+source $(dirname $0)/install-deps.sh
 
-declare -A PKG_MAP
-
-CHECK_CMD_PKGS=(
-    libffi
-    libopenssl
-    net-tools
-    python-devel
-)
-
-# Check zypper before apt-get in case zypper-aptitude
-# is installed
-if [ -x '/usr/bin/zypper' ]; then
-    OS_FAMILY="Suse"
-    INSTALLER_CMD="sudo -H zypper install -y"
-    CHECK_CMD="zypper search --match-exact --installed"
-    PKG_MAP=(
-        [gcc]=gcc
-        [git]=git
-        [libffi]=libffi-devel
-        [libopenssl]=libopenssl-devel
-        [net-tools]=net-tools
-        [python]=python
-        [python-devel]=python-devel
-        [venv]=python-virtualenv
-        [wget]=wget
-    )
-    EXTRA_PKG_DEPS=( python-xml )
-    # NOTE (cinerama): we can't install python without removing this package
-    # if it exists
-    if $(${CHECK_CMD} patterns-openSUSE-minimal_base-conflicts &> /dev/null); then
-        sudo -H zypper remove -y patterns-openSUSE-minimal_base-conflicts
-    fi
-elif [ -x '/usr/bin/apt-get' ]; then
-    OS_FAMILY="Debian"
-    INSTALLER_CMD="sudo -H apt-get -y install"
-    CHECK_CMD="dpkg -l"
-    PKG_MAP=( [gcc]=gcc
-              [git]=git
-              [libffi]=libffi-dev
-              [libopenssl]=libssl-dev
-              [net-tools]=net-tools
-              [python]=python-minimal
-              [python-devel]=libpython-dev
-              [venv]=python-virtualenv
-              [wget]=wget
-            )
-    EXTRA_PKG_DEPS=()
-elif [ -x '/usr/bin/yum' ]; then
-    OS_FAMILY="RedHat"
-    INSTALLER_CMD="sudo -H yum -y install"
-    CHECK_CMD="rpm -q"
-    PKG_MAP=(
-        [gcc]=gcc
-        [git]=git
-        [libffi]=libffi-devel
-        [libopenssl]=openssl-devel
-        [net-tools]=net-tools
-        [python]=python
-        [python-devel]=python-devel
-        [venv]=python-virtualenv
-        [wget]=wget
-    )
-    EXTRA_PKG_DEPS=()
+if [[ "$ANSIBLE_FROM_PYPI" == "True" ]]; then
+    source $(dirname $0)/install-ansible-pip.sh
 else
-    echo "ERROR: Supported package manager not found.  Supported: apt,yum,zypper"
-fi
-
-if ! $(python --version &>/dev/null); then
-    ${INSTALLER_CMD} ${PKG_MAP[python]}
-fi
-if ! $(gcc -v &>/dev/null); then
-    ${INSTALLER_CMD} ${PKG_MAP[gcc]}
-fi
-if ! $(git --version &>/dev/null); then
-    ${INSTALLER_CMD} ${PKG_MAP[git]}
-fi
-if ! $(wget --version &>/dev/null); then
-    ${INSTALLER_CMD} ${PKG_MAP[wget]}
-fi
-if [ -n "${VENV-}" ]; then
-    if $(virtualenv --version &>/dev/null); then
-        ${INSTALLER_CMD} ${PKG_MAP[venv]}
-    fi
-fi
-
-for pkg in ${CHECK_CMD_PKGS[@]}; do
-    if ! $(${CHECK_CMD} ${PKG_MAP[$pkg]} &>/dev/null); then
-        ${INSTALLER_CMD} ${PKG_MAP[$pkg]}
-    fi
-done
-
-if [ -n "${EXTRA_PKG_DEPS-}" ]; then
-    for pkg in ${EXTRA_PKG_DEPS}; do
-        if ! $(${CHECK_CMD} ${pkg} &>/dev/null); then
-            ${INSTALLER_CMD} ${pkg}
-        fi
-    done
-fi
-
-if [ -n "${VENV-}" ]; then
-    echo "NOTICE: Using virtualenv for this installation."
-    if [ ! -f ${VENV}/bin/activate ]; then
-        # only create venv if one doesn't exist
-        sudo -H -E virtualenv --no-site-packages ${VENV}
-    fi
-    # Note(cinerama): activate is not compatible with "set -u";
-    # disable it just for this line.
-    set +u
-    source ${VENV}/bin/activate
-    set -u
-    VIRTUAL_ENV=${VENV}
-else
-    echo "NOTICE: Not using virtualenv for this installation."
-fi
-
-# If we're using a venv, we need to work around sudo not
-# keeping the path even with -E.
-PYTHON=$(which python)
-
-# To install python packages, we need pip.
-#
-# We can't use the apt packaged version of pip since
-# older versions of pip are incompatible with
-# requests, one of our indirect dependencies (bug 1459947).
-#
-# Note(cinerama): We use pip to install an updated pip plus our
-# other python requirements. pip breakages can seriously impact us,
-# so we've chosen to install/upgrade pip here rather than in
-# requirements (which are synced automatically from the global ones)
-# so we can quickly and easily adjust version parameters.
-# See bug 1536627.
-#
-# Note(cinerama): If pip is linked to pip3, the rest of the install
-# won't work. Remove the alternatives. This is due to ansible's
-# python 2.x requirement.
-if [[ $(readlink -f /etc/alternatives/pip) =~ "pip3" ]]; then
-    sudo -H update-alternatives --remove pip $(readlink -f /etc/alternatives/pip)
-fi
-
-if ! which pip; then
-    wget -O /tmp/get-pip.py https://bootstrap.pypa.io/get-pip.py
-    sudo -H -E ${PYTHON} /tmp/get-pip.py
-fi
-
-PIP=$(which pip)
-
-sudo -H -E ${PIP} install "pip>6.0"
-sudo -H -E ${PIP} install -r "$(dirname $0)/../requirements.txt"
-u=$(whoami)
-g=$(groups | awk '{print $1}')
-
-if [ ! -d ${ANSIBLE_INSTALL_ROOT} ]; then
-    mkdir -p ${ANSIBLE_INSTALL_ROOT} || (sudo mkdir -p ${ANSIBLE_INSTALL_ROOT})
-fi
-sudo -H chown -R $u:$g ${ANSIBLE_INSTALL_ROOT}
-cd ${ANSIBLE_INSTALL_ROOT}
-
-if [ ! -d ansible ]; then
-    git clone $ANSIBLE_GIT_URL --recursive -b $ANSIBLE_GIT_BRANCH
-    cd ansible
-else
-    cd ansible
-    git remote update origin --prune
-    git fetch --tags
-    git checkout $ANSIBLE_GIT_BRANCH
-    git pull --rebase origin $ANSIBLE_GIT_BRANCH
-    git submodule update --init --recursive
-    git fetch
-fi
-# Note(TheJulia): These files should be in the ansible folder
-# and this functionality exists for a level of ansible 1.9.x
-# backwards compatability although the modules were developed
-# for Ansible 2.0.
-
-check_get_module `pwd`/lib/ansible/modules/core/cloud/openstack/os_ironic.py \
-    https://raw.githubusercontent.com/ansible/ansible-modules-core/stable-2.0/cloud/openstack/os_ironic.py
-check_get_module `pwd`/lib/ansible/modules/core/cloud/openstack/os_ironic_node.py \
-    https://raw.githubusercontent.com/ansible/ansible-modules-core/stable-2.0/cloud/openstack/os_ironic_node.py
-
-# Note(TheJulia): Proposed, however not yet accepted. Once the pull request
-# https://github.com/ansible/ansible-modules-extras/pull/1681 has merged, this
-# URL should be changed.
-check_get_module `pwd`/lib/ansible/modules/extras/cloud/openstack/os_ironic_inspect.py \
-    https://raw.githubusercontent.com/juliakreger/ansible-modules-extras/feature/os-ironic-inspect/cloud/openstack/os_ironic_inspect.py
-
-# os_keystone_service is targeted for Ansible 2.2
-check_get_module `pwd`/lib/ansible/modules/extras/cloud/openstack/os_keystone_service.py \
-    https://raw.githubusercontent.com/ansible/ansible-modules-extras/devel/cloud/openstack/os_keystone_service.py
-
-if [ -n "${VENV-}" ]; then
-    sudo -H -E ${PIP} install --upgrade ${ANSIBLE_INSTALL_ROOT}/ansible
-    echo
-    echo "To use bifrost, do"
-
-    echo "source ${VENV}/bin/activate"
-    echo "source env-vars"
-    echo "Then run playbooks as normal."
-    echo
-else
-    echo
-    echo "If you're using this script directly, execute the"
-    echo "following commands to update your shell."
-    echo
-    echo "source env-vars"
-    echo "source ${ANSIBLE_INSTALL_ROOT}/ansible/hacking/env-setup"
-    echo
+    source $(dirname $0)/install-ansible-source.sh
 fi
diff --git a/scripts/install-ansible-pip.sh b/scripts/install-ansible-pip.sh
new file mode 100644
index 000000000..7248055fc
--- /dev/null
+++ b/scripts/install-ansible-pip.sh
@@ -0,0 +1,15 @@
+#!/bin/bash
+set -eu
+
+ANSIBLE_PIP_VERSION=${ANSIBLE_PIP_VERSION:-"2.2"}
+sudo -H -E ${PIP} install "ansible==$ANSIBLE_PIP_VERSION"
+
+echo
+echo "To use bifrost, do"
+
+if [ -n "${VENV-}" ]; then
+    echo "source ${VENV}/bin/activate"
+fi
+echo "source env-vars"
+echo "Then run playbooks as normal."
+echo
diff --git a/scripts/install-ansible-source.sh b/scripts/install-ansible-source.sh
new file mode 100644
index 000000000..cc3c30590
--- /dev/null
+++ b/scripts/install-ansible-source.sh
@@ -0,0 +1,73 @@
+#!/bin/bash
+set -eu
+
+ANSIBLE_GIT_URL=${ANSIBLE_GIT_URL:-https://github.com/ansible/ansible.git}
+ANSIBLE_GIT_BRANCH=${ANSIBLE_GIT_BRANCH:-stable-2.1}
+ANSIBLE_INSTALL_ROOT=${ANSIBLE_INSTALL_ROOT:-/opt/stack}
+
+function check_get_module () {
+    local file=${1}
+    local url=${2}
+    if [ ! -e ${file} ]; then
+        wget -O ${file} ${url}
+    fi
+}
+
+u=$(whoami)
+g=$(groups | awk '{print $1}')
+
+if [ ! -d ${ANSIBLE_INSTALL_ROOT} ]; then
+    mkdir -p ${ANSIBLE_INSTALL_ROOT} || (sudo mkdir -p ${ANSIBLE_INSTALL_ROOT})
+fi
+sudo -H chown -R $u:$g ${ANSIBLE_INSTALL_ROOT}
+cd ${ANSIBLE_INSTALL_ROOT}
+
+if [ ! -d ansible ]; then
+    git clone $ANSIBLE_GIT_URL --recursive -b $ANSIBLE_GIT_BRANCH
+    cd ansible
+else
+    cd ansible
+    git remote update origin --prune
+    git fetch --tags
+    git checkout $ANSIBLE_GIT_BRANCH
+    git pull --rebase origin $ANSIBLE_GIT_BRANCH
+    git submodule update --init --recursive
+    git fetch
+fi
+# Note(TheJulia): These files should be in the ansible folder
+# and this functionality exists for a level of ansible 1.9.x
+# backwards compatability although the modules were developed
+# for Ansible 2.0.
+
+check_get_module `pwd`/lib/ansible/modules/core/cloud/openstack/os_ironic.py \
+    https://raw.githubusercontent.com/ansible/ansible-modules-core/stable-2.0/cloud/openstack/os_ironic.py
+check_get_module `pwd`/lib/ansible/modules/core/cloud/openstack/os_ironic_node.py \
+    https://raw.githubusercontent.com/ansible/ansible-modules-core/stable-2.0/cloud/openstack/os_ironic_node.py
+
+# os_ironic_inspect has appeared in Ansible 2.1
+check_get_module `pwd`/lib/ansible/modules/extras/cloud/openstack/os_ironic_inspect.py \
+    https://raw.githubusercontent.com/ansible/ansible-modules-extras/stable-2.1/cloud/os_ironic_inspect.py
+
+# os_keystone_service has appeared in Ansible 2.2
+check_get_module `pwd`/lib/ansible/modules/extras/cloud/openstack/os_keystone_service.py \
+    https://raw.githubusercontent.com/ansible/ansible-modules-extras/stable-2.2/cloud/openstack/os_keystone_service.py
+
+if [ -n "${VENV-}" ]; then
+    sudo -H -E ${PIP} install --upgrade ${ANSIBLE_INSTALL_ROOT}/ansible
+    echo
+    echo "To use bifrost, do"
+
+    echo "source ${VENV}/bin/activate"
+    echo "source env-vars"
+    echo "Then run playbooks as normal."
+    echo
+else
+    echo
+    echo "If you're using this script directly, execute the"
+    echo "following commands to update your shell."
+    echo
+    echo "source env-vars"
+    echo "source ${ANSIBLE_INSTALL_ROOT}/ansible/hacking/env-setup"
+    echo
+fi
+
diff --git a/scripts/install-deps.sh b/scripts/install-deps.sh
new file mode 100644
index 000000000..a2fdd158e
--- /dev/null
+++ b/scripts/install-deps.sh
@@ -0,0 +1,151 @@
+#!/bin/bash
+set -eu
+
+declare -A PKG_MAP
+
+CHECK_CMD_PKGS=(
+    libffi
+    libopenssl
+    net-tools
+    python-devel
+)
+
+# Check zypper before apt-get in case zypper-aptitude
+# is installed
+if [ -x '/usr/bin/zypper' ]; then
+    OS_FAMILY="Suse"
+    INSTALLER_CMD="sudo -H zypper install -y"
+    CHECK_CMD="zypper search --match-exact --installed"
+    PKG_MAP=(
+        [gcc]=gcc
+        [git]=git
+        [libffi]=libffi-devel
+        [libopenssl]=libopenssl-devel
+        [net-tools]=net-tools
+        [python]=python
+        [python-devel]=python-devel
+        [venv]=python-virtualenv
+        [wget]=wget
+    )
+    EXTRA_PKG_DEPS=( python-xml )
+    # NOTE (cinerama): we can't install python without removing this package
+    # if it exists
+    if $(${CHECK_CMD} patterns-openSUSE-minimal_base-conflicts &> /dev/null); then
+        sudo -H zypper remove -y patterns-openSUSE-minimal_base-conflicts
+    fi
+elif [ -x '/usr/bin/apt-get' ]; then
+    OS_FAMILY="Debian"
+    INSTALLER_CMD="sudo -H apt-get -y install"
+    CHECK_CMD="dpkg -l"
+    PKG_MAP=( [gcc]=gcc
+              [git]=git
+              [libffi]=libffi-dev
+              [libopenssl]=libssl-dev
+              [net-tools]=net-tools
+              [python]=python-minimal
+              [python-devel]=libpython-dev
+              [venv]=python-virtualenv
+              [wget]=wget
+            )
+    EXTRA_PKG_DEPS=()
+elif [ -x '/usr/bin/yum' ]; then
+    OS_FAMILY="RedHat"
+    INSTALLER_CMD="sudo -H yum -y install"
+    CHECK_CMD="rpm -q"
+    PKG_MAP=(
+        [gcc]=gcc
+        [git]=git
+        [libffi]=libffi-devel
+        [libopenssl]=openssl-devel
+        [net-tools]=net-tools
+        [python]=python
+        [python-devel]=python-devel
+        [venv]=python-virtualenv
+        [wget]=wget
+    )
+    EXTRA_PKG_DEPS=()
+else
+    echo "ERROR: Supported package manager not found.  Supported: apt,yum,zypper"
+fi
+
+if ! $(python --version &>/dev/null); then
+    ${INSTALLER_CMD} ${PKG_MAP[python]}
+fi
+if ! $(gcc -v &>/dev/null); then
+    ${INSTALLER_CMD} ${PKG_MAP[gcc]}
+fi
+if ! $(git --version &>/dev/null); then
+    ${INSTALLER_CMD} ${PKG_MAP[git]}
+fi
+if ! $(wget --version &>/dev/null); then
+    ${INSTALLER_CMD} ${PKG_MAP[wget]}
+fi
+if [ -n "${VENV-}" ]; then
+    if $(virtualenv --version &>/dev/null); then
+        ${INSTALLER_CMD} ${PKG_MAP[venv]}
+    fi
+fi
+
+for pkg in ${CHECK_CMD_PKGS[@]}; do
+    if ! $(${CHECK_CMD} ${PKG_MAP[$pkg]} &>/dev/null); then
+        ${INSTALLER_CMD} ${PKG_MAP[$pkg]}
+    fi
+done
+
+if [ -n "${EXTRA_PKG_DEPS-}" ]; then
+    for pkg in ${EXTRA_PKG_DEPS}; do
+        if ! $(${CHECK_CMD} ${pkg} &>/dev/null); then
+            ${INSTALLER_CMD} ${pkg}
+        fi
+    done
+fi
+
+if [ -n "${VENV-}" ]; then
+    echo "NOTICE: Using virtualenv for this installation."
+    if [ ! -f ${VENV}/bin/activate ]; then
+        # only create venv if one doesn't exist
+        sudo -H -E virtualenv --no-site-packages ${VENV}
+    fi
+    # Note(cinerama): activate is not compatible with "set -u";
+    # disable it just for this line.
+    set +u
+    source ${VENV}/bin/activate
+    set -u
+    VIRTUAL_ENV=${VENV}
+else
+    echo "NOTICE: Not using virtualenv for this installation."
+fi
+
+# If we're using a venv, we need to work around sudo not
+# keeping the path even with -E.
+PYTHON=$(which python)
+
+# To install python packages, we need pip.
+#
+# We can't use the apt packaged version of pip since
+# older versions of pip are incompatible with
+# requests, one of our indirect dependencies (bug 1459947).
+#
+# Note(cinerama): We use pip to install an updated pip plus our
+# other python requirements. pip breakages can seriously impact us,
+# so we've chosen to install/upgrade pip here rather than in
+# requirements (which are synced automatically from the global ones)
+# so we can quickly and easily adjust version parameters.
+# See bug 1536627.
+#
+# Note(cinerama): If pip is linked to pip3, the rest of the install
+# won't work. Remove the alternatives. This is due to ansible's
+# python 2.x requirement.
+if [[ $(readlink -f /etc/alternatives/pip) =~ "pip3" ]]; then
+    sudo -H update-alternatives --remove pip $(readlink -f /etc/alternatives/pip)
+fi
+
+if ! which pip; then
+    wget -O /tmp/get-pip.py https://bootstrap.pypa.io/get-pip.py
+    sudo -H -E ${PYTHON} /tmp/get-pip.py
+fi
+
+PIP=$(which pip)
+
+sudo -H -E ${PIP} install "pip>6.0"
+sudo -H -E ${PIP} install -r "$(dirname $0)/../requirements.txt"