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 /docker | |
| parent | 20aad9dc48f04507df016b1e93b04bd5c9043e68 (diff) | |
| parent | 203f5393760556f7833393daf362720867082e84 (diff) | |
| download | kolla-456274f6b09df64f6a0d53831b0c56a56fb19f09.tar.gz kolla-456274f6b09df64f6a0d53831b0c56a56fb19f09.zip | |
Merge "Deprecate chrony"
Diffstat (limited to 'docker')
| -rw-r--r-- | docker/chrony/Dockerfile.j2 | 2 | ||||
| -rw-r--r-- | docker/chrony/extend_start.sh | 2 |
2 files changed, 4 insertions, 0 deletions
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" |