diff options
| author | Zuul <zuul@review.opendev.org> | 2020-04-29 18:07:13 +0000 |
|---|---|---|
| committer | Gerrit Code Review <review@openstack.org> | 2020-04-29 18:07:13 +0000 |
| commit | d7a377260fbfb045a4fa11c97a8701f9c7eb471c (patch) | |
| tree | 5d0e13f9f40ee5cd80afb2d60c18d293495be8bf | |
| parent | c5fcf3fc05503890afd24774d10a14141fedf64f (diff) | |
| parent | 04f24b7bb1f043a0a4bd03bba877c20a4e96805b (diff) | |
| download | kolla-d7a377260fbfb045a4fa11c97a8701f9c7eb471c.tar.gz kolla-d7a377260fbfb045a4fa11c97a8701f9c7eb471c.zip | |
Merge "Revert "Add stunnel container for Glance service""
| -rw-r--r-- | doc/source/matrix_aarch64.csv | 1 | ||||
| -rw-r--r-- | doc/source/matrix_x86.csv | 1 | ||||
| -rw-r--r-- | docker/stunnel/Dockerfile.j2 | 15 | ||||
| -rw-r--r-- | releasenotes/notes/add-stunnel-54c00678cd8aba08.yaml | 4 |
4 files changed, 0 insertions, 21 deletions
diff --git a/doc/source/matrix_aarch64.csv b/doc/source/matrix_aarch64.csv index b5effaa3e..a5abc2fac 100644 --- a/doc/source/matrix_aarch64.csv +++ b/doc/source/matrix_aarch64.csv @@ -78,7 +78,6 @@ sensu (deprecated),C,C,N,N,N,N skydive,N,N,N,N,N,N solum,N,C,N,C,N,C storm,C,C,C,C,N,C -stunnel,C,C,C,C,C,C swift,C,C,C,C,N,C tacker,C,C,N,C,N,C telegraf,N,N,N,N,N,N diff --git a/doc/source/matrix_x86.csv b/doc/source/matrix_x86.csv index a0f7a9092..d9067502f 100644 --- a/doc/source/matrix_x86.csv +++ b/doc/source/matrix_x86.csv @@ -80,7 +80,6 @@ sensu (deprecated),C,C,C,C,N,N skydive,C,C,C,C,N,C solum,N,C,N,C,N,C storm,C,C,C,C,N,C -stunnel,C,C,C,C,C,C swift,C,T,C,T,N,C tacker,C,T,N,C,N,C telegraf,C,C,C,C,N,N diff --git a/docker/stunnel/Dockerfile.j2 b/docker/stunnel/Dockerfile.j2 deleted file mode 100644 index 1ffec4412..000000000 --- a/docker/stunnel/Dockerfile.j2 +++ /dev/null @@ -1,15 +0,0 @@ -FROM {{ namespace }}/{{ image_prefix }}base:{{ tag }} -{% block labels %} -LABEL maintainer="{{ maintainer }}" name="{{ image_name }}" build-date="{{ build_date }}" -{% endblock %} - -{% block stunnel_header %}{% endblock %} - -{% import "macros.j2" as macros with context %} - -{% set stunnel_packages = ['stunnel'] %} - -{{ macros.install_packages(stunnel_packages | customizable("packages")) }} - -{% block stunnel_footer %}{% endblock %} -{% block footer %}{% endblock %} diff --git a/releasenotes/notes/add-stunnel-54c00678cd8aba08.yaml b/releasenotes/notes/add-stunnel-54c00678cd8aba08.yaml deleted file mode 100644 index ab4c5cfe5..000000000 --- a/releasenotes/notes/add-stunnel-54c00678cd8aba08.yaml +++ /dev/null @@ -1,4 +0,0 @@ ---- -features: - - Adds stunnel container image initially to provide ssl termination for - Glance (eventlet). |