diff options
| author | Zuul <zuul@review.opendev.org> | 2021-12-21 12:16:04 +0000 |
|---|---|---|
| committer | Gerrit Code Review <review@openstack.org> | 2021-12-21 12:16:04 +0000 |
| commit | aacde4a0de59c118550a2897b48621e9d8d82736 (patch) | |
| tree | 31d996c72ed42105fbd5bcff6270a1e3667c6546 /docker | |
| parent | 5fc3949b927129600f123530e281275d41a1dded (diff) | |
| parent | 36a1286bbafa94daf3f91932cd0137bb0494fdf0 (diff) | |
| download | kolla-aacde4a0de59c118550a2897b48621e9d8d82736.tar.gz kolla-aacde4a0de59c118550a2897b48621e9d8d82736.zip | |
Merge "Drop vmtp"
Diffstat (limited to 'docker')
| -rw-r--r-- | docker/vmtp/Dockerfile.j2 | 38 | ||||
| -rw-r--r-- | docker/vmtp/vmtp_sudoers | 1 |
2 files changed, 0 insertions, 39 deletions
diff --git a/docker/vmtp/Dockerfile.j2 b/docker/vmtp/Dockerfile.j2 deleted file mode 100644 index fe5c6ca5c..000000000 --- a/docker/vmtp/Dockerfile.j2 +++ /dev/null @@ -1,38 +0,0 @@ -FROM {{ namespace }}/{{ image_prefix }}openstack-base:{{ tag }} -{% block labels %} -LABEL maintainer="{{ maintainer }}" name="{{ image_name }}" build-date="{{ build_date }}" -{% endblock %} - -{% block vmtp_header %}{% endblock %} - -{% import "macros.j2" as macros with context %} - -{{ macros.configure_user(name='vmtp') }} - -{% if install_type == 'binary' %} - -RUN echo '{{ install_type }} not yet available for {{ base_distro }}' \ - && /bin/false - -{% elif install_type == 'source' %} - -{% set vmtp_pip_packages = [ - '/vmtp' -] %} - -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 %} - -COPY vmtp_sudoers /etc/sudoers.d/kolla_vmtp_sudoers -RUN chmod 750 /etc/sudoers.d \ - && chmod 440 /etc/sudoers.d/kolla_vmtp_sudoers - -{% block vmtp_footer %}{% endblock %} -{% block footer %}{% endblock %} - -USER vmtp diff --git a/docker/vmtp/vmtp_sudoers b/docker/vmtp/vmtp_sudoers deleted file mode 100644 index fb3a27aff..000000000 --- a/docker/vmtp/vmtp_sudoers +++ /dev/null @@ -1 +0,0 @@ -%kolla ALL=(root) NOPASSWD: /usr/bin/chown -R vmtp\: /var/lib/vmtp, /bin/chown -R vmtp\: /var/lib/vmtp |