openstack
/
octavia
Code Issues Proposed changes

Merge "Force DIB Python version for py2 in diskimage-create"

This commit is contained in:
Zuul 2019-08-27 23:49:22 +00:00 committed by Gerrit Code Review
parent 9ec9859bbf 2504c10916
commit 60bd083ce6
1 changed files with 4 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
diskimage-create/diskimage-create.sh
View File

@ -428,6 +428,10 @@ if [ -n "$dib_enable_tracing" ]; then
dib_trace_arg="-x"
fi
if [ "$USE_PYTHON3" = "False" ]; then
export DIB_PYTHON_VERSION=2
fi
disk-image-create $AMP_LOGFILE $dib_trace_arg -a $AMP_ARCH -o $AMP_OUTPUTFILENAME -t $AMP_IMAGETYPE --image-size $AMP_IMAGESIZE --image-cache $AMP_CACHEDIR $AMP_DISABLE_TMP_FS $AMP_element_sequence
popd > /dev/null # out of $TEMP