aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorRadosław Piliszek <radoslaw.piliszek@gmail.com>2020-04-26 19:06:37 +0000
committerRadosław Piliszek <radoslaw.piliszek@gmail.com>2020-04-26 21:07:55 +0200
commit04f24b7bb1f043a0a4bd03bba877c20a4e96805b (patch)
tree5efb6c89385918fceb3ba31312e5c4818f05198a
parent63a55048912c2132d00e8b6d0b79e6d0d4835500 (diff)
downloadkolla-04f24b7bb1f043a0a4bd03bba877c20a4e96805b.tar.gz
kolla-04f24b7bb1f043a0a4bd03bba877c20a4e96805b.zip
Revert "Add stunnel container for Glance service"
This reverts commit 935adb59131caf66455a7d59c2af7cc42186e282. It seems we cannot use stunnel on Ubuntu because of no support for current OpenSSL. See [1]. We have some alternatives to replace stunnel: - HAProxy (image ready; in progress) - Apache2 (only embedded, no image) - Nginx (possibly in the future) [1] https://review.opendev.org/707131 Change-Id: If1140b293423ad3173cb3a4e1f19abbfecdaf2f6
-rw-r--r--doc/source/matrix_aarch64.csv1
-rw-r--r--doc/source/matrix_x86.csv1
-rw-r--r--docker/stunnel/Dockerfile.j215
-rw-r--r--releasenotes/notes/add-stunnel-54c00678cd8aba08.yaml4
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).