Merge "Clean up heat-all dockerfile"

4 files changed, 4 insertions, 28 deletions

diff --git a/doc/source/matrix_aarch64.csv b/doc/source/matrix_aarch64.csv
index f26dd48c2..5d605eb3c 100644
--- a/doc/source/matrix_aarch64.csv
+++ b/doc/source/matrix_aarch64.csv
@@ -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
diff --git a/doc/source/matrix_x86.csv b/doc/source/matrix_x86.csv
index 91de1865c..2ee147ba6 100644
--- a/doc/source/matrix_x86.csv
+++ b/doc/source/matrix_x86.csv
@@ -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
diff --git a/docker/heat/heat-all/Dockerfile.j2 b/docker/heat/heat-all/Dockerfile.j2
deleted file mode 100644
index e7ccb67a1..000000000
--- a/docker/heat/heat-all/Dockerfile.j2
+++ /dev/null
@@ -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
diff --git a/releasenotes/notes/remove-heat-all-c71e9deaffadb3e9.yaml b/releasenotes/notes/remove-heat-all-c71e9deaffadb3e9.yaml
new file mode 100644
index 000000000..4925b68ac
--- /dev/null
+++ b/releasenotes/notes/remove-heat-all-c71e9deaffadb3e9.yaml
@@ -0,0 +1,4 @@
+---
+upgrade:
+  - The ``heat-all`` image is removed per the deprecation cycle.
+    Please use the other images of Heat instead.