aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJenkins <jenkins@review.openstack.org>2017-02-05 13:17:42 +0000
committerGerrit Code Review <review@openstack.org>2017-02-05 13:17:42 +0000
commit04ab0bfdd3622368eda15118e6af29be1882f801 (patch)
tree1d42e9e1f5d936eb5f732050b4728b02d6a4f061
parent061c3f8371902b997bf007a555240403e53ba4ec (diff)
parent8bc3628e8ad2b1b9a2a14f687341a07c7237dd32 (diff)
downloadkolla-04ab0bfdd3622368eda15118e6af29be1882f801.tar.gz
kolla-04ab0bfdd3622368eda15118e6af29be1882f801.zip
Merge "Install osprofiler in magnum base container"
-rw-r--r--docker/magnum/magnum-base/Dockerfile.j22
1 files changed, 1 insertions, 1 deletions
diff --git a/docker/magnum/magnum-base/Dockerfile.j2 b/docker/magnum/magnum-base/Dockerfile.j2
index 23d85a4d5..e81dd7c1e 100644
--- a/docker/magnum/magnum-base/Dockerfile.j2
+++ b/docker/magnum/magnum-base/Dockerfile.j2
@@ -19,7 +19,7 @@ MAINTAINER {{ maintainer }}
ADD magnum-base-archive /magnum-base-source
RUN ln -s magnum-base-source/* magnum \
- && /var/lib/kolla/venv/bin/pip --no-cache-dir install --upgrade -c requirements/upper-constraints.txt /magnum \
+ && /var/lib/kolla/venv/bin/pip --no-cache-dir install --upgrade -c requirements/upper-constraints.txt /magnum[osprofiler] \
&& mkdir -p /etc/magnum \
&& cp -r /magnum/etc/magnum/* /etc/magnum \
&& chown -R magnum: /etc/magnum