From 21c3b2070af0635486f66e0b864533952760738e Mon Sep 17 00:00:00 2001
From: Paul Bourke <paul.bourke@oracle.com>
Date: Wed, 22 Mar 2017 11:27:38 +0000
Subject: [PATCH] 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
---
 docker/vmtp/Dockerfile.j2 | 8 ++++++--
 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 69084d018c..9c85f3a8d7 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 4daa941bda..984b21e86e 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/'