4 files changed, 21 insertions, 0 deletions
diff --git a/doc/source/matrix_aarch64.csv b/doc/source/matrix_aarch64.csv
index cd697d1d7..d9b05d6fe 100644
--- a/doc/source/matrix_aarch64.csv
+++ b/doc/source/matrix_aarch64.csv
@@ -78,6 +78,7 @@ 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 855fb1b66..03db5d2c1 100644
--- a/doc/source/matrix_x86.csv
+++ b/doc/source/matrix_x86.csv
@@ -80,6 +80,7 @@ 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,C,C,C,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
new file mode 100644
index 000000000..1ffec4412
--- /dev/null
+++ b/docker/stunnel/Dockerfile.j2
@@ -0,0 +1,15 @@
+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
new file mode 100644
index 000000000..ab4c5cfe5
--- /dev/null
+++ b/releasenotes/notes/add-stunnel-54c00678cd8aba08.yaml
@@ -0,0 +1,4 @@
+---
+features:
+  - Adds stunnel container image initially to provide ssl termination for
+    Glance (eventlet).