aboutsummaryrefslogtreecommitdiff
path: root/docker/swift
diff options
context:
space:
mode:
authorSamYaple <sam@yaple.net>2015-12-27 02:41:30 +0000
committerSamYaple <sam@yaple.net>2015-12-27 03:35:35 +0000
commitcda0459ad1c6c51ec5de3bd4492c96e1db48c4d7 (patch)
tree6479fa1fe24ec8adf078253ff95b34b136dda9dc /docker/swift
parent44576361670deadfed68f5d516524d95e54461d5 (diff)
downloadkolla-cda0459ad1c6c51ec5de3bd4492c96e1db48c4d7.tar.gz
kolla-cda0459ad1c6c51ec5de3bd4492c96e1db48c4d7.zip
Fix pip install settings
There were some inconsistencies with pip install instructions thoughout Kolla. We fix those here. Additionally, we fix the virtualenv to properly use the site-packages on the host if a library is not available in the venv. Change-Id: Ib84d48e8826bb96060338b3fa0782620c98794a8 Related-Bug: #1524684 Closes-Bug: #1529434
Diffstat (limited to 'docker/swift')
-rw-r--r--docker/swift/swift-base/Dockerfile.j22
1 files changed, 1 insertions, 1 deletions
diff --git a/docker/swift/swift-base/Dockerfile.j2 b/docker/swift/swift-base/Dockerfile.j2
index 872ed57fe..786e71535 100644
--- a/docker/swift/swift-base/Dockerfile.j2
+++ b/docker/swift/swift-base/Dockerfile.j2
@@ -13,7 +13,7 @@ RUN yum -y install openstack-swift \
ADD swift-base-archive /swift-base-source
RUN ln -s swift-base-source/* swift \
&& useradd --user-group swift \
- && /var/lib/kolla/venv/bin/pip --no-cache-dir install -c requirements/upper-constraints.txt /swift \
+ && /var/lib/kolla/venv/bin/pip --no-cache-dir install --upgrade -c requirements/upper-constraints.txt /swift \
&& mkdir -p /etc/swift /var/log/swift /home/swift \
&& cp -r /swift/etc/* /etc/swift/ \
&& chown -R swift: /etc/swift /var/log/swift /home/swift