aboutsummaryrefslogtreecommitdiff
path: root/docker
diff options
context:
space:
mode:
authorJenkins <jenkins@review.openstack.org>2017-03-28 13:39:20 +0000
committerGerrit Code Review <review@openstack.org>2017-03-28 13:39:20 +0000
commita068763b522e59805d86e2b6bb760fff97cd428c (patch)
tree2081fd64e40e99e76cc4314a7960fe513021e5d0 /docker
parent409b8d91f5a3fa9372d601bd54b7f0044dff9d50 (diff)
parent21c3b2070af0635486f66e0b864533952760738e (diff)
downloadkolla-a068763b522e59805d86e2b6bb760fff97cd428c.tar.gz
kolla-a068763b522e59805d86e2b6bb760fff97cd428c.zip
Merge "Fix source install for vmtp"
Diffstat (limited to 'docker')
-rw-r--r--docker/vmtp/Dockerfile.j28
1 files changed, 6 insertions, 2 deletions
diff --git a/docker/vmtp/Dockerfile.j2 b/docker/vmtp/Dockerfile.j2
index 69084d018..9c85f3a8d 100644
--- a/docker/vmtp/Dockerfile.j2
+++ b/docker/vmtp/Dockerfile.j2
@@ -15,10 +15,14 @@ RUN echo '{{ install_type }} not yet available for {{ base_distro }}' \
{% elif install_type == 'source' %}
{% set vmtp_pip_packages = [
- 'vmtp'
+ '/vmtp'
] %}
-RUN {{ macros.install_pip(vmtp_pip_packages | customizable("pip_packages"), constraints = false) }}
+ADD vmtp-archive /vmtp-source
+RUN ln -s vmtp-source/* vmtp \
+ && {{ macros.install_pip(vmtp_pip_packages | customizable("pip_packages")) }} \
+ && mkdir -p /etc/vmtp \
+ && chown -R vmtp: /etc/vmtp
{% endif %}