Merge "Clean up heat-all dockerfile"

This commit is contained in:
Zuul 2020-11-09 17:50:55 +00:00 committed by Gerrit Code Review
commit 0967976818
4 changed files with 4 additions and 28 deletions

View File

@ -25,7 +25,6 @@ grafana,C,C,C,C,N,C
hacluster,N,N,C,C,N,C
haproxy,C,C,C,C,N,C
heat,C,C,C,C,N,C
heat-all (deprecated),C,C,C,C,N,C
horizon,C,C,C,C,N,C
influxdb,N,N,C,C,N,C
ironic,C,C,C,C,N,C

1 Image,CentOS,,Ubuntu,,Debian
25 hacluster,N,N,C,C,N,C
26 haproxy,C,C,C,C,N,C
27 heat,C,C,C,C,N,C
heat-all (deprecated),C,C,C,C,N,C
28 horizon,C,C,C,C,N,C
29 influxdb,N,N,C,C,N,C
30 ironic,C,C,C,C,N,C

View File

@ -26,7 +26,6 @@ hacluster,C,C,C,C,C,C
hacluster-pcs,N,N,C,C,C,C
haproxy,T,T,T,T,C,C
heat,T,T,N,T,C,T
heat-all (deprecated),T,T,N,T,C,T
horizon,T,T,T,T,C,T
influxdb,C,C,C,C,C,C
ironic,T,T,C,T,C,C

1 Image,CentOS,,Ubuntu,,Debian
26 hacluster-pcs,N,N,C,C,C,C
27 haproxy,T,T,T,T,C,C
28 heat,T,T,N,T,C,T
heat-all (deprecated),T,T,N,T,C,T
29 horizon,T,T,T,T,C,T
30 influxdb,C,C,C,C,C,C
31 ironic,T,T,C,T,C,C

View File

@ -1,26 +0,0 @@
FROM {{ namespace }}/{{ image_prefix }}heat-base:{{ tag }}
{% block labels %}
LABEL maintainer="{{ maintainer }}" name="{{ image_name }}" build-date="{{ build_date }}"
{% endblock %}
{% block heat_all_header %}{% endblock %}
{% import "macros.j2" as macros with context %}
{% if install_type == 'binary' %}
{% if base_package_type == 'rpm' %}
{% set heat_all_packages = [
'openstack-heat-api',
'openstack-heat-engine',
'openstack-heat-monolith'
] %}
{% elif base_package_type == 'deb' %}
RUN echo 'heat-all not yet available for {{ base_distro }}' && /bin/false
{% endif %}
{{ macros.install_packages(heat_all_packages | customizable("packages")) }}
{% endif %}
{% block heat_all_footer %}{% endblock %}
{% block footer %}{% endblock %}
USER heat

View File

@ -0,0 +1,4 @@
---
upgrade:
- The ``heat-all`` image is removed per the deprecation cycle.
Please use the other images of Heat instead.