From e7ecb75ec46d355c23982118c10f8accfb5f14fb Mon Sep 17 00:00:00 2001
From: "wu.chunyang" <wuchunyang@yovole.com>
Date: Mon, 17 May 2021 21:23:48 +0800
Subject: Remove chrony image from kolla

chrony is not supported in 'x' cycle, remove it from kolla

Change-Id: I4d754e17280cc7e6ee95c46ffec3b86c2336fe48
---
 docker/chrony/Dockerfile.j2   | 22 ----------------------
 docker/chrony/extend_start.sh | 18 ------------------
 2 files changed, 40 deletions(-)
 delete mode 100644 docker/chrony/Dockerfile.j2
 delete mode 100644 docker/chrony/extend_start.sh

(limited to 'docker')

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
-- 
cgit v1.2.3