Fix image build when installing agent from package

There is a bug in the octavia-lib DIB element where it runs install
actions that should only be ran when the amphora-agent is installed from
source. This issue causes the amphora image build to fail when
installing the amphora-agent from distribution packages (option -p in
the diskimage-create.sh tool).

Task: 40870
Story: 2008138

Change-Id: I46ba7798322f24255ab7d49db4b4df886e92cbf3
This commit is contained in:
Carlos Goncalves 2020-09-14 18:51:49 +02:00
parent b400620a24
commit 16f9d2ebf8

View File

@ -6,6 +6,8 @@ fi
set -eu set -eu
set -o pipefail set -o pipefail
[ "${DIB_INSTALLTYPE_amphora_agent:-}" = "package" ] && exit 0
AMP_VENV=/opt/amphora-agent-venv AMP_VENV=/opt/amphora-agent-venv
sed -i 's|octavia-lib|#octavia-lib|' /opt/upper-constraints.txt sed -i 's|octavia-lib|#octavia-lib|' /opt/upper-constraints.txt