From 6b224da2bcc5f5806b1867f3ea683033556129c1 Mon Sep 17 00:00:00 2001
From: Mark Goddard <mark@stackhpc.com>
Date: Thu, 17 Sep 2020 11:19:01 +0100
Subject: [PATCH] Add heat-all and nova-mksproxy to Victoria deprecated images

Change-Id: I272a2640e041465fff615f0c690d118eca5a6779
---
 doc/source/matrix_aarch64.csv                             | 2 ++
 doc/source/matrix_x86.csv                                 | 2 ++
 .../notes/deprecate-images-victoria-75748b9ff3a1e21f.yaml | 8 ++++----
 3 files changed, 8 insertions(+), 4 deletions(-)

diff --git a/doc/source/matrix_aarch64.csv b/doc/source/matrix_aarch64.csv
index 6e3b86b4bb..c90ea926c4 100644
--- a/doc/source/matrix_aarch64.csv
+++ b/doc/source/matrix_aarch64.csv
@@ -26,6 +26,7 @@ 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
@@ -52,6 +53,7 @@ murano,C,C,C,C,N,C
 neutron,C,C,C,C,N,C
 neutron-mlnx-agent,C,C,N,C,N,C
 nova,C,C,C,C,N,C
+nova-mksproxy (deprecated),C,C,C,C,N,C
 nova-spicehtml5proxy,N,N,C,C,N,C
 novajoin (deprecated),C,C,N,C,N,C
 octavia,C,C,N,C,N,C
diff --git a/doc/source/matrix_x86.csv b/doc/source/matrix_x86.csv
index afdf238c61..4e6836fdb8 100644
--- a/doc/source/matrix_x86.csv
+++ b/doc/source/matrix_x86.csv
@@ -27,6 +27,7 @@ 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
@@ -53,6 +54,7 @@ murano,C,C,C,C,C,C
 neutron,T,T,T,T,C,T
 neutron-mlnx-agent,C,C,N,C,N,C
 nova,T,T,T,T,C,T
+nova-mksproxy (deprecated),T,T,T,T,C,T
 nova-spicehtml5proxy,N,N,T,T,C,T
 novajoin (deprecated),C,C,N,C,N,C
 octavia,C,C,N,C,C,C
diff --git a/releasenotes/notes/deprecate-images-victoria-75748b9ff3a1e21f.yaml b/releasenotes/notes/deprecate-images-victoria-75748b9ff3a1e21f.yaml
index 9738cedb46..d82856e7da 100644
--- a/releasenotes/notes/deprecate-images-victoria-75748b9ff3a1e21f.yaml
+++ b/releasenotes/notes/deprecate-images-victoria-75748b9ff3a1e21f.yaml
@@ -1,7 +1,7 @@
 ---
 deprecations:
   - |
-    Deprecates support for the ``certmonger``, ``ec2-api``, ``novajoin``,
-    ``ptp``, ``radvd``, ``rsyslog`` and ``zaqar`` images. In Wallaby support
-    for these images will be removed from Kolla. No known downstream projects
-    use these images.
+    Deprecates support for the ``certmonger``, ``ec2-api``, ``heat-all``,
+    ``novajoin``, ``nova-mksproxy``, ``ptp``, ``radvd``, ``rsyslog`` and
+    ``zaqar`` images. In Wallaby support for these images will be removed from
+    Kolla. No known downstream projects use these images.