diff --git a/README.rst b/README.rst index 9e9220cd7a..fb9b075474 100644 --- a/README.rst +++ b/README.rst @@ -113,7 +113,7 @@ Infrastructure components Kolla provides images to deploy the following infrastructure components: - `Chrony `__ a versatile implementation - of the Network Time Protocol (NTP). + of the Network Time Protocol (NTP) [deprecated]. - `Collectd `__, `InfluxDB `__, and `Grafana `__ for performance monitoring. diff --git a/doc/source/matrix_aarch64.csv b/doc/source/matrix_aarch64.csv index 040f629754..e7d4bfcefd 100644 --- a/doc/source/matrix_aarch64.csv +++ b/doc/source/matrix_aarch64.csv @@ -5,7 +5,7 @@ barbican,C,C,C,C,N,C bifrost,N,C,N,N,N,N blazar,N,C,N,C,N,C ceilometer,C,C,C,C,N,C -chrony,C,C,C,C,N,C +chrony (deprecated),C,C,C,C,N,C cinder,C,C,C,C,N,C cloudkitty,C,C,N,C,N,C collectd,C,C,C,C,N,C diff --git a/doc/source/matrix_x86.csv b/doc/source/matrix_x86.csv index 42b41f21b8..89b20adfb9 100644 --- a/doc/source/matrix_x86.csv +++ b/doc/source/matrix_x86.csv @@ -5,7 +5,7 @@ barbican,C,T,C,C,C,C bifrost,N,T,N,C,N,N blazar,N,C,N,C,N,C ceilometer,C,C,C,C,C,C -chrony,T,T,T,T,C,T +chrony (deprecated),T,T,T,T,C,T cinder,C,T,C,T,C,C cloudkitty,C,C,N,C,N,C collectd,C,C,C,C,C,C diff --git a/docker/chrony/Dockerfile.j2 b/docker/chrony/Dockerfile.j2 index fe22a4b10e..5fce735cb4 100644 --- a/docker/chrony/Dockerfile.j2 +++ b/docker/chrony/Dockerfile.j2 @@ -3,6 +3,8 @@ FROM {{ namespace }}/{{ infra_image_prefix }}base:{{ tag }} LABEL maintainer="{{ maintainer }}" name="{{ image_name }}" build-date="{{ build_date }}" {% endblock %} +# chrony image is deprecated + {% block chrony_header %}{% endblock %} {% import "macros.j2" as macros with context %} diff --git a/docker/chrony/extend_start.sh b/docker/chrony/extend_start.sh index bc28e56969..7391a0a95b 100644 --- a/docker/chrony/extend_start.sh +++ b/docker/chrony/extend_start.sh @@ -1,5 +1,7 @@ #!/bin/bash +echo "chrony image is deprecated" + rm -f /var/run/chronyd.pid CHRONY_LOG_DIR="/var/log/kolla/chrony" diff --git a/releasenotes/notes/deprecate-chrony-5cd7c7627a5b9f0e.yaml b/releasenotes/notes/deprecate-chrony-5cd7c7627a5b9f0e.yaml new file mode 100644 index 0000000000..5148ba1d5a --- /dev/null +++ b/releasenotes/notes/deprecate-chrony-5cd7c7627a5b9f0e.yaml @@ -0,0 +1,4 @@ +--- +deprecations: + - | + The ``chrony`` image is deprecated and will be removed in the Xena cycle.