diff --git a/requirements.txt b/requirements.txt
index 732bdaa838..a98520706e 100644
--- a/requirements.txt
+++ b/requirements.txt
@@ -6,6 +6,8 @@ setuptools!=24.0.0,>=16.0 # PSF/ZPL
 wheel # MIT
 netaddr!=0.7.16,>=0.7.12 # BSD
 PrettyTable<0.8,>=0.7 # BSD
+pyasn1  # BSD
+pyOpenSSL>=0.14  # Apache-2.0
 pycrypto>=2.6 # Public Domain
 PyYAML>=3.1.0 # MIT
 virtualenv # MIT
diff --git a/scripts/bootstrap-ansible.sh b/scripts/bootstrap-ansible.sh
index b51d105b1b..da1406f155 100755
--- a/scripts/bootstrap-ansible.sh
+++ b/scripts/bootstrap-ansible.sh
@@ -51,17 +51,17 @@ case ${DISTRO_ID} in
     centos|rhel)
         yum check-update && yum -y install git python2 curl autoconf gcc-c++ \
           python2-devel gcc libffi-devel openssl-devel python-requests \
-          python-pyasn1 pyOpenSSL python-ndg_httpsclient
-        ;;
-    fedora)
-        dnf --refresh -y install git python curl autoconf gcc-c++ \
-          python-devel gcc libffi-devel openssl-devel python-requests
+          python-pyasn1 pyOpenSSL python-ndg_httpsclient \
+          python-netaddr python-prettytable python-crypto PyYAML \
+          python-virtualenv
         ;;
     ubuntu)
         apt-get update && \
           DEBIAN_FRONTEND=noninteractive apt-get -y install \
           git python-all python-dev curl python2.7-dev build-essential \
-          libssl-dev libffi-dev python-requests python-openssl python-pyasn1
+          libssl-dev libffi-dev python-requests python-openssl python-pyasn1 \
+          python-netaddr python-prettytable python-crypto python-yaml \
+          python-virtualenv
         ;;
 esac
 
@@ -88,10 +88,6 @@ if [ ! $(which "$PIP_COMMAND") ]; then
   PIP_COMMAND=pip
 fi
 
-# When upgrading there will already be a pip.conf file locking pip down to the repo server, in such cases it may be
-# necessary to use --isolated because the repo server does not meet the specified requirements.
-$PIP_COMMAND install $PIP_OPTS -r requirements.txt || $PIP_COMMAND install --isolated $PIP_OPTS -r requirements.txt
-
 # Create a Virtualenv for the Ansible runtime
 PYTHON_EXEC_PATH="$(which python2 || which python)"
 virtualenv --always-copy --system-site-packages --python="${PYTHON_EXEC_PATH}" /opt/ansible-runtime