Merge "Add support for building vmtp container"

3 files changed, 29 insertions, 0 deletions

diff --git a/docker/openstack-base/Dockerfile.j2 b/docker/openstack-base/Dockerfile.j2
index 41b309945..9b5809786 100644
--- a/docker/openstack-base/Dockerfile.j2
+++ b/docker/openstack-base/Dockerfile.j2
@@ -195,6 +195,7 @@ RUN {{ macros.install_packages(openstack_base_packages | customizable("packages"
             'libffi-devel',
             'libxml2-devel',
             'libxslt-devel',
+            'libyaml-devel',
             'MariaDB-devel',
             'openldap-devel',
             'openssl-devel',
@@ -212,7 +213,9 @@ RUN {{ macros.install_packages(openstack_base_packages | customizable("packages"
             'libmariadbclient-dev',
             'libxslt1-dev',
             'libffi-dev',
+            'libxml2-dev',
             'libyaml-dev',
+            'libz-dev',
             'pkg-config',
             'git'
         ] %}
diff --git a/docker/vmtp/Dockerfile.j2 b/docker/vmtp/Dockerfile.j2
new file mode 100644
index 000000000..b286ac03e
--- /dev/null
+++ b/docker/vmtp/Dockerfile.j2
@@ -0,0 +1,25 @@
+FROM {{ namespace }}/{{ image_prefix }}openstack-base:{{ tag }}
+MAINTAINER {{ maintainer }}
+
+{% if install_type == 'binary' %}
+
+RUN echo '{{ install_type }} not yet available for {{ base_distro }}' \
+    && /bin/false
+
+{% elif install_type == 'source' %}
+
+RUN pip install vmtp \
+    && useradd --user-group vmtp
+
+{% endif %}
+
+COPY vmtp_sudoers /etc/sudoers.d/kolla_vmtp_sudoers
+RUN chmod 750 /etc/sudoers.d \
+    && chmod 440 /etc/sudoers.d \
+    && usermod -a -G kolla vmtp
+
+{% block vmtp_footer %}{% endblock %}
+{% block footer %}{% endblock %}
+{{ include_footer }}
+
+USER vmtp
diff --git a/docker/vmtp/vmtp_sudoers b/docker/vmtp/vmtp_sudoers
new file mode 100644
index 000000000..fb3a27aff
--- /dev/null
+++ b/docker/vmtp/vmtp_sudoers
@@ -0,0 +1 @@
+%kolla ALL=(root) NOPASSWD: /usr/bin/chown -R vmtp\: /var/lib/vmtp, /bin/chown -R vmtp\: /var/lib/vmtp