diff options
| author | Zuul <zuul@review.opendev.org> | 2021-03-25 22:57:53 +0000 |
|---|---|---|
| committer | Gerrit Code Review <review@openstack.org> | 2021-03-25 22:57:53 +0000 |
| commit | 456274f6b09df64f6a0d53831b0c56a56fb19f09 (patch) | |
| tree | 9b5af2144e64db6073e5b7b4b0d9fbecd6c60a7d | |
| parent | 20aad9dc48f04507df016b1e93b04bd5c9043e68 (diff) | |
| parent | 203f5393760556f7833393daf362720867082e84 (diff) | |
| download | kolla-456274f6b09df64f6a0d53831b0c56a56fb19f09.tar.gz kolla-456274f6b09df64f6a0d53831b0c56a56fb19f09.zip | |
Merge "Deprecate chrony"
| -rw-r--r-- | README.rst | 2 | ||||
| -rw-r--r-- | doc/source/matrix_aarch64.csv | 2 | ||||
| -rw-r--r-- | doc/source/matrix_x86.csv | 2 | ||||
| -rw-r--r-- | docker/chrony/Dockerfile.j2 | 2 | ||||
| -rw-r--r-- | docker/chrony/extend_start.sh | 2 | ||||
| -rw-r--r-- | releasenotes/notes/deprecate-chrony-5cd7c7627a5b9f0e.yaml | 4 |
6 files changed, 11 insertions, 3 deletions
diff --git a/README.rst b/README.rst index 9e9220cd7..fb9b07547 100644 --- a/README.rst +++ b/README.rst @@ -113,7 +113,7 @@ Infrastructure components Kolla provides images to deploy the following infrastructure components: - `Chrony <https://chrony.tuxfamily.org/>`__ a versatile implementation - of the Network Time Protocol (NTP). + of the Network Time Protocol (NTP) [deprecated]. - `Collectd <https://collectd.org>`__, `InfluxDB <https://influxdata.com/time-series-platform/influxdb/>`__, and `Grafana <https://grafana.com>`__ for performance monitoring. diff --git a/doc/source/matrix_aarch64.csv b/doc/source/matrix_aarch64.csv index 040f62975..e7d4bfcef 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 42b41f21b..89b20adfb 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 fe22a4b10..5fce735cb 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 bc28e5696..7391a0a95 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 000000000..5148ba1d5 --- /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. |