openstack
/
diskimage-builder
Code Issues Proposed changes

Export YUM variable in centos bases 

Other fedora/centos elements can use the YUM variable, already set in
some base elements (fedora, centos-minimal). This commit also exports it
for centos/centos7.

Set a fallback value in pip-and-virtualenv element.

Change-Id: I681d77b924be035c81043bb34c72ec5f859e7108
Closes-Bug: 1598087
This commit is contained in:
Bernard Cafarelli 2016-07-01 12:14:38 +02:00
parent 5a5529fb84
commit 097240c226
3 changed files with 8 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
elements/centos/environment.d/10-centos6-distro-name.bash
View File

@ -1,2 +1,5 @@
export DISTRO_NAME=centos
export DIB_RELEASE=${DIB_RELEASE:-GenericCloud}
# Useful for elements that work with fedora (dnf) & centos
export YUM=${YUM:-yum}

5
elements/centos7/environment.d/10-centos7-distro-name.bash
View File

@ -1,2 +1,5 @@
export DIB_RELEASE=GenericCloud
export DISTRO_NAME=centos7
export DIB_RELEASE=GenericCloud
# Useful for elements that work with fedora (dnf) & centos
export YUM=${YUM:-yum}

2
elements/pip-and-virtualenv/install.d/pip-and-virtualenv-source-install/01-install-pip
View File

@ -16,7 +16,7 @@ if [[ $DISTRO_NAME =~ (centos|fedora) ]]; then
# on somebody does a "yum install python-virtualenv" and goes and
# overwrites the pip installed version with the packaged version,
# leading to all sorts of weird version issues.
${YUM} install -y python-virtualenv python-pip python-setuptools
${YUM:-yum} install -y python-virtualenv python-pip python-setuptools
# install pip; this overwrites packaged pip
python /tmp/get-pip.py