From 16f9d2ebf8e0ccbb8c26396c8eed8ad3f33bc66e Mon Sep 17 00:00:00 2001 From: Carlos Goncalves Date: Mon, 14 Sep 2020 18:51:49 +0200 Subject: [PATCH] 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 --- .../install.d/octavia-lib-source-install/76-octavia-lib-install | 2 ++ 1 file changed, 2 insertions(+) diff --git a/elements/octavia-lib/install.d/octavia-lib-source-install/76-octavia-lib-install b/elements/octavia-lib/install.d/octavia-lib-source-install/76-octavia-lib-install index ea054f9d92..e5fed70207 100755 --- a/elements/octavia-lib/install.d/octavia-lib-source-install/76-octavia-lib-install +++ b/elements/octavia-lib/install.d/octavia-lib-source-install/76-octavia-lib-install @@ -6,6 +6,8 @@ fi set -eu set -o pipefail +[ "${DIB_INSTALLTYPE_amphora_agent:-}" = "package" ] && exit 0 + AMP_VENV=/opt/amphora-agent-venv sed -i 's|octavia-lib|#octavia-lib|' /opt/upper-constraints.txt