From 34a47353f0b87602d13a0456ac807187914381a8 Mon Sep 17 00:00:00 2001 From: Michael Johnson Date: Mon, 12 Dec 2016 22:14:23 +0000 Subject: [PATCH] Fix the agent install to use pip -U The previous patch that switched the agent install to use pip install did not include the -U switch or the upper constraints flag. This patch adds those to the amphora-agent element. Change-Id: If907909704fcff4c7be10690eb4f50d0ba54b1c1 --- elements/amphora-agent/install.d/75-run_setup_install | 2 +- elements/amphora-agent/source-repository-amphora-agent | 1 + 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/elements/amphora-agent/install.d/75-run_setup_install b/elements/amphora-agent/install.d/75-run_setup_install index 997ceedd15..b4c4695a77 100755 --- a/elements/amphora-agent/install.d/75-run_setup_install +++ b/elements/amphora-agent/install.d/75-run_setup_install @@ -6,7 +6,7 @@ fi set -eu set -o pipefail -pip install /opt/amphora-agent +pip install -U -c /opt/upper-constraints.txt /opt/amphora-agent mkdir /etc/octavia # we assume certs, etc will come in through the config drive diff --git a/elements/amphora-agent/source-repository-amphora-agent b/elements/amphora-agent/source-repository-amphora-agent index 456d3f522a..50bcb72f05 100644 --- a/elements/amphora-agent/source-repository-amphora-agent +++ b/elements/amphora-agent/source-repository-amphora-agent @@ -1,2 +1,3 @@ # This is temporary until we have a pip package amphora-agent git /opt/amphora-agent https://git.openstack.org/openstack/octavia +upper-constraints file /opt/upper-constraints.txt https://git.openstack.org/cgit/openstack/requirements/plain/upper-constraints.txt