openstack
/
diskimage-builder
Code Issues Proposed changes

Merge "pip-and-virtualenv: fix install-pip when centos-release-openstack is enabled"

This commit is contained in:
Zuul 2018-04-23 02:07:51 +00:00 committed by Gerrit Code Review
parent 4a9fe4b133 abd63b01aa
commit d2b03eefe8
1 changed files with 8 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
diskimage_builder/elements/pip-and-virtualenv/install.d/pip-and-virtualenv-source-install/04-install-pip
View File

@ -15,7 +15,14 @@ if [[ $DISTRO_NAME =~ (opensuse|fedora|centos|centos7|rhel7) ]]; then
centos*|rhel7)
# note python2-pip in epel
_extra_repo="--enablerepo=epel"
packages="python-virtualenv python2-pip python-setuptools"
packages="python-virtualenv python2-pip"
if [[ "$(rpm -q --qf '[%{obsoletes}\n]' python2-setuptools)" == "python-setuptools" ]]; then
# If OpenStack release is installed, then python-setuptools is
# obsoleted by python2-setuptools
packages+=" python2-setuptools"
else
packages+=" python-setuptools"
fi
;;
fedora)
_do_py3=1