Merge "Revert "Add stunnel container for Glance service""
This commit is contained in:
commit
d7a377260f
|
@ -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
|
||||
|
|
|
|
@ -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
|
||||
|
|
|
|
@ -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 %}
|
|
@ -1,4 +0,0 @@
|
|||
---
|
||||
features:
|
||||
- Adds stunnel container image initially to provide ssl termination for
|
||||
Glance (eventlet).
|
Loading…
Reference in New Issue