From 796dcd043be51753d3c3272778af48ead572b035 Mon Sep 17 00:00:00 2001 From: Mathieu Mitchell Date: Thu, 25 Aug 2016 13:32:20 +0000 Subject: [PATCH] Generate and use upper-constraints for ironic-agent Currently, ironic-python-agent is installed without using an upper-constraints.txt file. This commits ensures ironic-python-agent is installed using upper-constraints. Change-Id: I6be6cfc012941e2cc9996717cba39b5415b85e14 Closes-Bug: #1616554 --- .../ironic-agent-source-install/60-ironic-agent-install | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/elements/ironic-agent/install.d/ironic-agent-source-install/60-ironic-agent-install b/elements/ironic-agent/install.d/ironic-agent-source-install/60-ironic-agent-install index 1169f176b..622879be3 100755 --- a/elements/ironic-agent/install.d/ironic-agent-source-install/60-ironic-agent-install +++ b/elements/ironic-agent/install.d/ironic-agent-source-install/60-ironic-agent-install @@ -9,11 +9,14 @@ set -o pipefail SCRIPTDIR=$(dirname $0) IPADIR=/usr/share/ironic-python-agent +# Generate upper-constraints +$IPADIR/imagebuild/common/generate_upper_constraints.sh $IPADIR/upper-constraints.txt + # create the virtual environment virtualenv $IPADIR/venv # install IPA inside the virtual environment -$IPADIR/venv/bin/pip install $IPADIR +$IPADIR/venv/bin/pip install -c $IPADIR/upper-constraints.txt $IPADIR # FIXME(lucasagomes): Figure out how we can use the "--install-option" # parameter for pip install so we don't have to manually create a symlink