From 721f64dad15637f249c835e7017538c67e42c794 Mon Sep 17 00:00:00 2001 From: Pavlo Shchelokovskyy Date: Tue, 8 Aug 2017 15:12:05 +0000 Subject: [PATCH] Change python vs other dependencies install order 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 --- devstack/plugin.sh | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-) diff --git a/devstack/plugin.sh b/devstack/plugin.sh index 06b39d9..e2451f9 100755 --- a/devstack/plugin.sh +++ b/devstack/plugin.sh @@ -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 }