openstack
/
kolla
Code Issues Proposed changes

Fix source install for vmtp 

Install vmtp from source rather than pip for the source install type.

Closes-Bug: #1675733
Co-Authored-By: Mark Duggan <mark.duggan@oracle.com>
Change-Id: I2d024f6d5561306101b0ccec80a34378697d9282
This commit is contained in:
Paul Bourke 2017-03-22 11:27:38 +00:00 committed by Paul Bourke (pbourke)
parent ac1d2df3b8
commit 21c3b2070a
2 changed files with 10 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
docker/vmtp/Dockerfile.j2
View File

@ -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 %}

4
kolla/common/config.py
View File

@ -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/'