openstack/openstack-ansible
Code Issues Proposed changes

Fix CentOS Ansible bootstrap

Browse Source 
This patch implements the following fixes to the bootstrap-ansible
script in order to make it work successfully on CentOS7:

 - Remove yum check-update as it returns 0 only when no updates are
   available.
 - Add a variable to adjust the virtualenv CLI based on the distro
   used as '--always-copy' does not work on CentOS.


Change-Id: Ia591c3558bd00945dc3076ed19d4c6e364bec939
This commit is contained in:
Marc Gariepy 2016-09-15 09:33:00 -04:00 committed by Jesse Pretorius (odyssey4me)
parent 195b505dff
commit ee40a8ad6e
1 changed files with 5 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
scripts/bootstrap-ansible.sh
View File

@ -28,6 +28,8 @@ export SSH_DIR=${SSH_DIR:-"/root/.ssh"}
export DEBIAN_FRONTEND=${DEBIAN_FRONTEND:-"noninteractive"}
# Set the role fetch mode to any option [galaxy, git-clone]
export ANSIBLE_ROLE_FETCH_MODE=${ANSIBLE_ROLE_FETCH_MODE:-galaxy}
# virtualenv vars
VIRTUALENV_OPTIONS="--always-copy"
# This script should be executed from the root directory of the cloned repo
cd "$(dirname "${0}")/.."
@ -51,12 +53,12 @@ determine_distro
# Install the base packages
case ${DISTRO_ID} in
centos|rhel)
yum check-update
yum -y install git python2 curl autoconf gcc-c++ \
python2-devel gcc libffi-devel nc openssl-devel python-requests \
python2-devel gcc libffi-devel nc openssl-devel \
python-pyasn1 pyOpenSSL python-ndg_httpsclient \
python-netaddr python-prettytable python-crypto PyYAML \
python-virtualenv
VIRTUALENV_OPTIONS=""
;;
ubuntu)
apt-get update
@ -88,7 +90,7 @@ fi
# Create a Virtualenv for the Ansible runtime
PYTHON_EXEC_PATH="$(which python2 || which python)"
virtualenv --clear --always-copy --system-site-packages --python="${PYTHON_EXEC_PATH}" /opt/ansible-runtime
virtualenv --clear ${VIRTUALENV_OPTIONS} --system-site-packages --python="${PYTHON_EXEC_PATH}" /opt/ansible-runtime
# Install ansible
PIP_OPTS+=" --upgrade"