x/ironic-staging-drivers
Code Issues Proposed changes

Change python vs other dependencies install order

Browse Source 
for each driver, install the 'other' dependencies first just in case
those contain something needed to build the Python dependencies when
installing them.

Change-Id: I5a35dcc2d7ee516e3db52f982d6af8205d7a7ba6
Co-Authored-By: Karim Boumedhel <karimboumedhel@gmail.com>
This commit is contained in:
Pavlo Shchelokovskyy 2017-08-08 15:12:05 +00:00
parent 47d5e7a7b9
commit 721f64dad1
1 changed files with 6 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
devstack/plugin.sh
View File

@ -46,14 +46,16 @@ function install_drivers_dependencies {
if [[ -d $path && ! "$IRONIC_DRIVERS_EXCLUDED_DIRS" =~ "$driver" ]]; then
p_deps=${IRONIC_STAGING_DRIVERS_DIR}/ironic_staging_drivers/${driver}/python-requirements.txt
o_deps=${IRONIC_STAGING_DRIVERS_DIR}/ironic_staging_drivers/${driver}/other-requirements.sh
if [[ -f "$p_deps" ]]; then
echo_summary "Installing $driver python dependencies"
pip_install -r $p_deps
fi
# NOTE(pas-ha) install 'other' dependencies first just in case
# they contain something required to build Python dependencies
if [[ -f "$o_deps" ]]; then
echo_summary "Installing $driver other dependencies"
source $o_deps
fi
if [[ -f "$p_deps" ]]; then
echo_summary "Installing $driver python dependencies"
pip_install -r $p_deps
fi
fi
done
}