openstack
/
openstack-ansible
Code Issues Proposed changes

Add SNI support via OS/python packages 

To ensure that the Ansible venv has the right packages installed,
requirements.txt is updated with the appropriate packages.

To ensure that the OS for the deployment host is appropriately
prepared for the Ansible venv creation, to install pip, and
python packages into the venv, OS packages are installed.

Fedora install support is removed from the script as it is an
unsupported platform and unmaintained section.

Change-Id: Ib4e219294f5fd93c6a50814955ab97424a79dafd
This commit is contained in:
Jesse Pretorius 2016-07-29 18:18:33 +01:00 committed by Jesse Pretorius (odyssey4me)
parent b7e966f89d
commit 17db05965f
2 changed files with 8 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
requirements.txt
View File

@ -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

16
scripts/bootstrap-ansible.sh
View File

@ -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