diff options
| author | Jenkins <jenkins@review.openstack.org> | 2017-03-28 13:39:20 +0000 |
|---|---|---|
| committer | Gerrit Code Review <review@openstack.org> | 2017-03-28 13:39:20 +0000 |
| commit | a068763b522e59805d86e2b6bb760fff97cd428c (patch) | |
| tree | 2081fd64e40e99e76cc4314a7960fe513021e5d0 | |
| parent | 409b8d91f5a3fa9372d601bd54b7f0044dff9d50 (diff) | |
| parent | 21c3b2070af0635486f66e0b864533952760738e (diff) | |
| download | kolla-a068763b522e59805d86e2b6bb760fff97cd428c.tar.gz kolla-a068763b522e59805d86e2b6bb760fff97cd428c.zip | |
Merge "Fix source install for vmtp"
| -rw-r--r-- | docker/vmtp/Dockerfile.j2 | 8 | ||||
| -rwxr-xr-x | kolla/common/config.py | 4 |
2 files changed, 10 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 %} diff --git a/kolla/common/config.py b/kolla/common/config.py index 643670ccd..047963498 100755 --- a/kolla/common/config.py +++ b/kolla/common/config.py @@ -523,6 +523,10 @@ SOURCES = { 'type': 'url', 'location': ('$tarballs_base/vitrage/' 'vitrage-master.tar.gz')}, + 'vmtp': { + 'type': 'url', + 'location': ('$tarballs_base/vmtp/' + 'vmtp-master.tar.gz')}, 'watcher-base': { 'type': 'url', 'location': ('$tarballs_base/watcher/' |