openstack
/
tripleo-quickstart
Code Issues Proposed changes

Merge "use a single bindep config file"

This commit is contained in:
Zuul 2019-02-08 20:28:22 +00:00 committed by Gerrit Code Review
parent 2f494620c8 9c7c547bc8
commit 9dce0e6236
4 changed files with 39 additions and 38 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

38
bindep.txt Normal file
View File

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

18
bindep_python2.txt
View File

@ -1,18 +0,0 @@
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
View File

@ -1,17 +0,0 @@
# 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

4
install-deps.sh
View File

@ -198,9 +198,7 @@ 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
bindep -b -f bindep.txt || sudo $(package_manager) -y install `bindep -b -f bindep.txt`;
else
print_sudo_warning
fi