8 files changed, 21 insertions, 6 deletions
diff --git a/README.rst b/README.rst
index fb9b07547..83b42e0f4 100644
--- a/README.rst
+++ b/README.rst
@@ -94,13 +94,13 @@ Kolla provides images to deploy the following OpenStack projects:
 - `Nova <https://docs.openstack.org/nova/latest/>`__
 - `Octavia <https://docs.openstack.org/octavia/latest/>`__
 - `Panko <https://docs.openstack.org/panko/latest/>`__
-- `Rally <https://docs.openstack.org/rally/latest/>`__
+- `Rally <https://docs.openstack.org/rally/latest/>`__ [deprecated]
 - `Sahara <https://docs.openstack.org/sahara/latest/>`__
 - `Senlin <https://docs.openstack.org/senlin/latest/>`__
 - `Solum <https://docs.openstack.org/solum/latest/>`__
 - `Swift <https://docs.openstack.org/swift/latest/>`__
 - `Tacker <https://docs.openstack.org/tacker/latest/>`__
-- `Tempest <https://docs.openstack.org/tempest/latest/>`__
+- `Tempest <https://docs.openstack.org/tempest/latest/>`__ [deprecated]
 - `Trove <https://docs.openstack.org/trove/latest/>`__
 - `Vitrage <https://docs.openstack.org/vitrage/latest/>`__
 - `Vmtp <https://vmtp.readthedocs.io/en/latest/>`__
diff --git a/doc/source/matrix_aarch64.csv b/doc/source/matrix_aarch64.csv
index 9b4ed7a4d..858a5f5e3 100644
--- a/doc/source/matrix_aarch64.csv
+++ b/doc/source/matrix_aarch64.csv
@@ -58,7 +58,7 @@ placement,C,C,N,C,N,C
 prometheus,C,C,C,C,N,C
 qdrouterd,C,C,C,C,N,N
 rabbitmq,C,C,C,C,N,C
-rally,C,C,N,C,N,C
+rally (deprecated),C,C,N,C,N,C
 redis,C,C,C,C,N,C
 sahara,C,C,C,C,N,C
 senlin,C,C,C,C,N,C
@@ -68,7 +68,7 @@ storm,C,C,C,C,N,C
 swift,C,C,C,C,N,C
 tacker,C,C,N,C,N,C
 telegraf,N,N,N,N,N,N
-tempest,C,N,C,N,N,N
+tempest (deprecated),C,N,C,N,N,N
 tgtd,C,C,C,C,N,C
 trove,C,C,N,C,N,C
 vitrage,C,C,N,C,N,C
diff --git a/doc/source/matrix_x86.csv b/doc/source/matrix_x86.csv
index 5a423ca43..9e113fed2 100644
--- a/doc/source/matrix_x86.csv
+++ b/doc/source/matrix_x86.csv
@@ -59,7 +59,7 @@ placement,T,T,T,T,C,T
 prometheus,C,C,C,C,C,C
 qdrouterd,C,C,N,N,N,N
 rabbitmq,T,T,T,T,C,T
-rally,C,C,N,C,C,C
+rally (deprecated),C,C,N,C,C,C
 redis,C,T,C,C,C,C
 sahara,C,C,C,C,C,C
 senlin,C,C,C,C,C,C
@@ -69,7 +69,7 @@ storm,C,C,C,C,C,C
 swift,C,T,C,T,C,C
 tacker,C,T,N,C,N,C
 telegraf,C,C,C,C,C,N
-tempest,C,C,C,C,C,C
+tempest (deprecated),C,C,C,C,C,C
 tgtd,N,N,C,T,C,C
 trove,C,C,C,C,N,C
 vitrage,C,C,N,C,C,C
diff --git a/docker/rally/Dockerfile.j2 b/docker/rally/Dockerfile.j2
index ef76824c4..a3ab3730f 100644
--- a/docker/rally/Dockerfile.j2
+++ b/docker/rally/Dockerfile.j2
@@ -3,6 +3,8 @@ FROM {{ namespace }}/{{ image_prefix }}openstack-base:{{ tag }}
 LABEL maintainer="{{ maintainer }}" name="{{ image_name }}" build-date="{{ build_date }}"
 {% endblock %}
 
+# rally image is deprecated
+
 {% block rally_header %}{% endblock %}
 
 {% import "macros.j2" as macros with context %}
diff --git a/docker/rally/extend_start.sh b/docker/rally/extend_start.sh
index 88f3d054f..14d98c6dd 100644
--- a/docker/rally/extend_start.sh
+++ b/docker/rally/extend_start.sh
@@ -1,5 +1,7 @@
 #!/bin/bash
 
+echo "rally image is deprecated"
+
 if [[ ! -d "/var/log/kolla/rally" ]]; then
     mkdir -p /var/log/kolla/rally
 fi
diff --git a/docker/tempest/Dockerfile.j2 b/docker/tempest/Dockerfile.j2
index de3a49358..93a73e2f5 100644
--- a/docker/tempest/Dockerfile.j2
+++ b/docker/tempest/Dockerfile.j2
@@ -3,6 +3,8 @@ FROM {{ namespace }}/{{ image_prefix }}openstack-base:{{ tag }}
 LABEL maintainer="{{ maintainer }}" name="{{ image_name }}" build-date="{{ build_date }}"
 {% endblock %}
 
+# tempest image is deprecated
+
 {% block tempest_header %}{% endblock %}
 
 {% import "macros.j2" as macros with context %}
diff --git a/docker/tempest/extend_start.sh b/docker/tempest/extend_start.sh
index 48397041f..974376afc 100644
--- a/docker/tempest/extend_start.sh
+++ b/docker/tempest/extend_start.sh
@@ -1,5 +1,7 @@
 #! /bin/bash
 
+echo "tempest image is deprecated"
+
 if [[ ! -d "/var/log/kolla/tempest" ]]; then
     mkdir -p /var/log/kolla/tempest
 fi
diff --git a/releasenotes/notes/deprecate-tempest-and-rally-0647efa7209cf03a.yaml b/releasenotes/notes/deprecate-tempest-and-rally-0647efa7209cf03a.yaml
new file mode 100644
index 000000000..afd66897f
--- /dev/null
+++ b/releasenotes/notes/deprecate-tempest-and-rally-0647efa7209cf03a.yaml
@@ -0,0 +1,7 @@
+---
+deprecations:
+  - |
+    The ``tempest`` and ``rally`` images are deprecated and will be
+    removed in the Xena cycle.
+    The reason is that these are not services of an OpenStack cloud but
+    its clients.