openstack
/
diskimage-builder
Code Issues Proposed changes

Merge "upgrade pip before using -c option"

This commit is contained in:
Zuul 2018-02-05 22:34:00 +00:00 committed by Gerrit Code Review
parent 926767f9ce 34ff72f253
commit cb599b13de
2 changed files with 11 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
diskimage_builder/elements/ironic-agent/install.d/ironic-agent-source-install/60-ironic-agent-install
View File

@ -15,6 +15,9 @@ $IPADIR/imagebuild/common/generate_upper_constraints.sh $IPADIR/upper-constraint
# create the virtual environment
virtualenv $IPADIR/venv
# pip might be an older version which does not support the -c option, therefore upgrade first
$IPADIR/venv/bin/pip install pip --upgrade
# install IPA inside the virtual environment
$IPADIR/venv/bin/pip install -c $IPADIR/upper-constraints.txt $IPADIR

8
releasenotes/notes/upgrade-pip-before-c-d2443847f9d58c7a.yaml Normal file
View File

@ -0,0 +1,8 @@
---
fixes:
- |
This fixes bug 1744403 where 60-ironic-agent-install fails to run
when DIB_INSTALLTYPE_ironic_agent=source is set. pip installs
constraints with the -c argument and this argument is a relatively
newer addion. The currently installed pip may not support that
option and must be upgraded before proceeding.