diff options
| author | Larry Rensing <lr699s@att.com> | 2016-08-12 13:27:27 +0000 |
|---|---|---|
| committer | Larry Rensing <lr699s@att.com> | 2016-08-16 15:46:46 +0000 |
| commit | 4218a3bb5bc8daaf45e5c6522e6f949d49fec513 (patch) | |
| tree | f53dbed3097fcdbb3b7534ef71690d08a62879d5 /docker | |
| parent | 856d0a866c2802de2394d54c9f516cfef13d07c0 (diff) | |
| download | kolla-4218a3bb5bc8daaf45e5c6522e6f949d49fec513.tar.gz kolla-4218a3bb5bc8daaf45e5c6522e6f949d49fec513.zip | |
Add support for building vmtp container
Add needed library packages and Dockerfile to build vmtp container.
Co-Authored-By: Larry Rensing <lr699s@att.com>
Partially implements: bp vmtp-container
Change-Id: I54340947f3bdf61d3e4f54884fed90ac318124ff
Diffstat (limited to 'docker')
| -rw-r--r-- | docker/openstack-base/Dockerfile.j2 | 3 | ||||
| -rw-r--r-- | docker/vmtp/Dockerfile.j2 | 25 | ||||
| -rw-r--r-- | docker/vmtp/vmtp_sudoers | 1 |
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 |