diff options
| author | Zuul <zuul@review.opendev.org> | 2021-10-01 09:39:56 +0000 |
|---|---|---|
| committer | Gerrit Code Review <review@openstack.org> | 2021-10-01 09:39:56 +0000 |
| commit | 8ca0af63d45034b14fa5b2e41db33710ae6d00eb (patch) | |
| tree | a3c1ca96168fca040f28329a15ea560e1b18e397 /docker/chrony | |
| parent | 150efda3013ea57147440e6b78fc8afb9f25bdec (diff) | |
| parent | e7ecb75ec46d355c23982118c10f8accfb5f14fb (diff) | |
| download | kolla-8ca0af63d45034b14fa5b2e41db33710ae6d00eb.tar.gz kolla-8ca0af63d45034b14fa5b2e41db33710ae6d00eb.zip | |
Merge "Remove chrony image from kolla"
Diffstat (limited to 'docker/chrony')
| -rw-r--r-- | docker/chrony/Dockerfile.j2 | 22 | ||||
| -rw-r--r-- | docker/chrony/extend_start.sh | 18 |
2 files changed, 0 insertions, 40 deletions
diff --git a/docker/chrony/Dockerfile.j2 b/docker/chrony/Dockerfile.j2 deleted file mode 100644 index 5fce735cb..000000000 --- a/docker/chrony/Dockerfile.j2 +++ /dev/null @@ -1,22 +0,0 @@ -FROM {{ namespace }}/{{ infra_image_prefix }}base:{{ tag }} -{% block labels %} -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 %} - -{{ macros.configure_user(name='chrony') }} - -{% set chrony_packages = ['chrony'] %} - -{{ macros.install_packages(chrony_packages | customizable("packages")) }} - -COPY extend_start.sh /usr/local/bin/kolla_extend_start -RUN chmod 755 /usr/local/bin/kolla_extend_start - -{% block chrony_footer %}{% endblock %} -{% block footer %}{% endblock %} diff --git a/docker/chrony/extend_start.sh b/docker/chrony/extend_start.sh deleted file mode 100644 index 7391a0a95..000000000 --- a/docker/chrony/extend_start.sh +++ /dev/null @@ -1,18 +0,0 @@ -#!/bin/bash - -echo "chrony image is deprecated" - -rm -f /var/run/chronyd.pid - -CHRONY_LOG_DIR="/var/log/kolla/chrony" -if [[ ! -d "${CHRONY_LOG_DIR}" ]]; then - mkdir -p ${CHRONY_LOG_DIR} -fi - -if [[ $(stat -c %a ${CHRONY_LOG_DIR}) != "755" ]]; then - chmod 755 /var/log/kolla/chrony -fi - -if [[ $(stat -c %U:%G ${CHRONY_LOG_DIR}) != "chrony:chrony" ]]; then - chown chrony:chrony ${CHRONY_LOG_DIR} -fi |