use bindep to install rpm deps

Use the functions in install-deps.sh to install the rpm and
python modules required for quickstart.sh

Add option to quickstart.sh to override the sudo check
-q, --override_sudo_check"
If passwordless sudo is not enabled, prompt for
the user password while installing packages

Details:
https://tree.taiga.io/project/tripleo-ci-board/us/571

Change-Id: I984bca564dc53fff9fd2b6b37a613aaa42f0f9e3
This commit is contained in:
Wes Hayutin 2019-01-31 15:22:27 -07:00 committed by wes hayutin
parent 85904bf8c7
commit fbee853ba8
4 changed files with 174 additions and 47 deletions

18
bindep_python2.txt Normal file
View File

@ -0,0 +1,18 @@
gcc
git
iproute
libyaml
libffi-devel
openssl-devel
python2-libselinux [platform:fedora]
python3-libselinux [platform:fedora]
python2-netaddr [platform:fedora]
python2-setuptools [platform:fedora]
python2-virtualenv [platform:fedora]
python2-pip [platform:fedora]
libselinux-python [platform:centos]
python-netaddr [platform:centos]
python-setuptools [platform:centos]
python-virtualenv [platform:centos]
python-pip [platform:centos]
redhat-rpm-config

17
bindep_python3.txt Normal file
View File

@ -0,0 +1,17 @@
# possible bug in ansible, f29 python 3 env fails
# w/o both python-libselinux packages installed
# https://bugs.launchpad.net/tripleo/+bug/1812324
gcc
git
iproute
libyaml
libffi-devel
openssl-devel
python2-libselinux [platform:fedora]
python3-libselinux [platform:fedora]
python3-netaddr [platform:fedora]
python3-setuptools [platform:fedora]
python3-virtualenv [platform:fedora]
python3-pip [platform:fedora]
redhat-rpm-config

View File

@ -3,11 +3,21 @@
# Now broken out for more reuse
# install-deps.sh
# atm mvp for the reproducer is python2 only
# expect this option to be removed once
# python2 and python3 have been validated
print_sudo_warning() {
echo -e "\e[31m WARNING: SUDO is not passwordless, assuming all packages \
are installed! \n export USER_OVERRIDE_SUDO_CHECK=1 \n to be prompted for sudo \
password \e[0m"
}
python_cmd() {
distribution=unknown
distribution_major_version=unknown
# we prefer python2 because on few systems python->python3
python_cmd=python2
python_cmd=${USER_PYTHON_OVERRIDE:=python2}
if [ -f /etc/os-release ]; then
. /etc/os-release
@ -15,19 +25,19 @@ python_cmd() {
case $NAME in
"Red Hat"*) distribution="RedHat"
if [ "$distribution_major_version" -ge "8" ]; then
python_cmd=python3
python_cmd=${USER_PYTHON_OVERRIDE:=python3}
fi
;;
"CentOS"*)
distribution="CentOS"
if [ "$distribution_major_version" -ge "8" ]; then
python_cmd=python3
python_cmd=${USER_PYTHON_OVERRIDE:=python3}
fi
;;
"Fedora"*)
distribution="Fedora"
if [ "$distribution_major_version" -ge "28" ]; then
python_cmd=python3
python_cmd=${USER_PYTHON_OVERRIDE:=python3}
fi
;;
"Ubuntu"*)
@ -76,11 +86,16 @@ check_python_module () {
install_deps () {
# If sudo isn't installed assume we already are a super user
# install it anyways so that the install of the other deps succeeds
# install enough rpms for the appropriate python version to
# enable bindep and python environments
echo "Running install_deps"
PYTHON_PACKAGES=()
MODULE_NAMES="pip virtualenv setuptools"
rpm -q sudo || $(package_manager) install -y sudo
sudo -n true && passwordless_sudo="1" || passwordless_sudo="0"
if [[ "$passwordless_sudo" == "1" ]]; then
if [[ "$passwordless_sudo" == "1" ]] || [ "$USER_OVERRIDE_SUDO_CHECK" == "1" ]; then
if [ "$(python_cmd)" == "python3" ]; then
# possible bug in ansible, f29 python 3 env fails
# w/o both python-libselinux packages installed
@ -96,24 +111,20 @@ install_deps () {
VIRTUALENV_PACKAGE=python-virtualenv
PIP_PACKAGE=python-pip
fi
echo "Installing RPM packages $PYTHON_PACKAGES $SETUPTOOLS_PACKAGE \
$VIRTUALENV_PACKAGE $PIP_PACKAGE" | tr -s [:space:]
sudo $(package_manager) -y install $PYTHON_PACKAGES \
$SETUPTOOLS_PACKAGE \
$VIRTUALENV_PACKAGE \
$PIP_PACKAGE
check_python_module virtualenv &> /dev/null || \
PYTHON_PACKAGES+=($VIRTUALENV_PACKAGE)
check_python_module setuptools &> /dev/null || \
PYTHON_PACKAGES+=($SETUPTOOLS_PACKAGE)
sudo $(package_manager) install -y \
/usr/bin/git \
gcc \
iproute \
libyaml \
libffi-devel \
openssl-devel \
redhat-rpm-config \
${PYTHON_PACKAGES[@]}
else
echo "WARNING: SUDO is not passwordless, assuming all packages are installed!"
print_sudo_warning
fi
# pip is a special case because centos-7 repos do not have an rpm for
@ -139,4 +150,102 @@ install_deps () {
fi
}
[[ "${BASH_SOURCE[0]}" == "${0}" ]] && install_deps
copy_selinux_to_venv() {
: ${LIBSELINUX_PYTHON_PATH:=lib64/python`$(python_cmd) -c "from sys import version_info as v; print('%s.%s' % (v[0], v[1]))"`/site-packages}
for FILE in /usr/$LIBSELINUX_PYTHON_PATH/_selinux* /usr/$LIBSELINUX_PYTHON_PATH/selinux ; do
ln -sf $FILE $VIRTUAL_ENV/$LIBSELINUX_PYTHON_PATH/
done
# validate that selinux import really works
$(python_cmd) -c "import sys; print(sys.path); import selinux; print('selinux.is_selinux_enabled: %s' % selinux.is_selinux_enabled())"
}
install_virtual_env(){
# Activate the virtualenv only when it is not already activated otherwise
# It create the virtualenv and then activate it.
echo "Running install_virtual_env"
if [[ -z ${VIRTUAL_ENV+x} ]]; then
$(python_cmd) -m virtualenv \
$( [ "$OPT_SYSTEM_PACKAGES" = 1 ] && printf -- "--system-site-packages\n" )\
$OPT_WORKDIR
. $OPT_WORKDIR/bin/activate
else
echo "Warning: VIRTUAL_ENV=$VIRTUAL_ENV was found active and is being reused."
fi
$(python_cmd) -m pip install pip --upgrade
echo "Installing bindep"
$(python_cmd) -m pip install bindep --upgrade
# In order to do any filesystem operations on the system running ansible (if it has SELinux installed)
# we need the python bindings in the venv. Unfortunately, it is not available on pypi, so we need to
# pull it from the system site packages. This is needed only if they are not already present there,
# for example creating the virtualenv using --system-site-packages on a system that has the
# libselinux python bidings does not need it, so we detect it first.
$(python_cmd) -c "import selinux" 2>/dev/null ||
copy_selinux_to_venv
}
install_bindep(){
# --user installs fail from a virtenv
echo "Running install_bindep"
$(python_cmd) -m pip install --user bindep --upgrade
}
install_package_deps_via_bindep(){
echo "install_package_deps_via_bindep"
sudo -n true && passwordless_sudo="1" || passwordless_sudo="0"
if [ "$passwordless_sudo" == "1" ] || [ "$USER_OVERRIDE_SUDO_CHECK" == "1" ]; then
for i in `bindep -b -f bindep_$(python_cmd).txt`; do
sudo $(package_manager) -y install $i;
done
else
print_sudo_warning
fi
}
bootstrap_ansible_via_rpm(){
echo "Running bootstrap_ansible_via_rpm"
if [ "$(python_cmd)" == "python3" ]; then
PACKAGES="python3-libselinux ansible ansible-python3 git rsync python3-netaddr"
elif [ "$(python_cmd)" == "python2" ]; then
PACKAGES=("python2-libselinux ansible git rsync python2-netaddr.noarch")
else
echo "ERROR: invalid python version"
fi
sudo -n true && passwordless_sudo="1" || passwordless_sudo="0"
if [ "$passwordless_sudo" == "1" ] || [ "$USER_OVERRIDE_SUDO_CHECK" == "1" ]; then
sudo $(package_manager) -y install $PACKAGES;
else
print_sudo_warning
fi
}
# This enables a user to install rpm dependencies directly
# from this script.
if [[ "${BASH_SOURCE[0]}" == "${0}" ]]; then
# This is not meant be an interactive script
# however, if users want to install by hand
# the option is provided.
# Allow to user to override the python version
export USER_PYTHON_OVERRIDE=python2
# This will allow the user to be prompted for commands
# requiring sudo vs. skipping the install assuming the
# requirements are already installed.
export USER_OVERRIDE_SUDO_CHECK="1"
# install just enough python
install_deps
# install bindep
install_bindep
# checks the $PWD for a file named
# bindep_python[2,3].txt and installs
# dependencies listed in the file.
install_package_deps_via_bindep
fi

View File

@ -26,6 +26,7 @@ ZUUL_CLONER=/usr/zuul-env/bin/zuul-cloner
: ${OPT_TEARDOWN:=nodes}
: ${OPT_WORKDIR:=~/.quickstart}
: ${OPT_LIST_TASKS_ONLY=""}
: ${USER_OVERRIDE_SUDO_CHECK:=0}
# disable pip implicit version check, if we need min version we should mention it
export PIP_DISABLE_PIP_VERSION_CHECK=${PIP_DISABLE_PIP_VERSION_CHECK:=1}
@ -103,19 +104,12 @@ fi
# requested via --bootstrap.
bootstrap () {
set -e
# install required deps for a python virtual environment
install_deps
# Activate the virtualenv only when it is not already activated otherwise
# It create the virtualenv and then activate it.
if [[ -z ${VIRTUAL_ENV+x} ]]; then
$(python_cmd) -m virtualenv \
$( [ "$OPT_SYSTEM_PACKAGES" = 1 ] && printf -- "--system-site-packages\n" )\
$OPT_WORKDIR
. $OPT_WORKDIR/bin/activate
else
echo "Warning: VIRTUAL_ENV=$VIRTUAL_ENV was found active and is being reused."
fi
$(python_cmd) -m pip install pip --upgrade
# setup the virtual environment
install_virtual_env
# continue package installs with bindep
install_package_deps_via_bindep
if [ "$OPT_NO_CLONE" != 1 ]; then
if ! [ -d "$OOOQ_DIR" ]; then
@ -159,24 +153,6 @@ bootstrap () {
fi
popd
# In order to do any filesystem operations on the system running ansible (if it has SELinux installed)
# we need the python bindings in the venv. Unfortunately, it is not available on pypi, so we need to
# pull it from the system site packages. This is needed only if they are not already present there,
# for example creating the virtualenv using --system-site-packages on a system that has the
# libselinux python bidings does not need it, so we detect it first.
$(python_cmd) -c "import selinux" 2>/dev/null ||
copy_selinux_to_venv
}
copy_selinux_to_venv() {
: ${LIBSELINUX_PYTHON_PATH:=lib64/python`$(python_cmd) -c "from sys import version_info as v; print('%s.%s' % (v[0], v[1]))"`/site-packages}
for FILE in /usr/$LIBSELINUX_PYTHON_PATH/_selinux* /usr/$LIBSELINUX_PYTHON_PATH/selinux ; do
ln -sf $FILE $VIRTUAL_ENV/$LIBSELINUX_PYTHON_PATH/
done
# validate that selinux import really works
$(python_cmd) -c "import sys; print(sys.path); import selinux; print('selinux.is_selinux_enabled: %s' % selinux.is_selinux_enabled())"
}
activate_venv() {
@ -234,6 +210,9 @@ usage () {
echo " -g, --gerrit <change-id>"
echo " check out <change-id> for the tripleo-quickstart repo"
echo " before running the playbook"
echo " -q, --override_sudo_check"
echo " If passwordless sudo is not enabled, prompt for "
echo " the user password while installing packages"
echo " -I, --retain-inventory"
echo " keep the ansible inventory on start, used for consecutive"
echo " runs of quickstart on the same environment"
@ -321,6 +300,10 @@ while [ "x$1" != "x" ]; do
shift
;;
--override_sudo_check|-q)
USER_OVERRIDE_SUDO_CHECK=1
;;
--nodes|-N)
OPT_NODES=$2
shift