Merge "Remove chrony image from kolla"

README.rst

@@ -109,8 +109,6 @@ 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) [deprecated].
 - `Collectd <https://collectd.org>`__,
   `InfluxDB <https://influxdata.com/time-series-platform/influxdb/>`__, and
   `Grafana <https://grafana.com>`__ for performance monitoring.

doc/source/matrix_aarch64.csv

@@ -5,7 +5,6 @@ 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 (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

doc/source/matrix_x86.csv

@@ -5,7 +5,6 @@ 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 (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

docker/chrony/Dockerfile.j2

@@ -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 %}

docker/chrony/extend_start.sh

@@ -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

kolla/common/config.py

@@ -119,7 +119,6 @@ _PROFILE_OPTS = [
                 help='Aux Images'),
     cfg.ListOpt('default',
                 default=[
-                    'chrony',
                     'cron',
                     'kolla-toolbox',
                     'fluentd',
@@ -662,10 +661,6 @@ USERS = {
         'uid': 42405,
         'gid': 42405,
     },
-    'chrony-user': {
-        'uid': 42406,
-        'gid': 42406,
-    },
     'cinder-user': {
         'uid': 42407,
         'gid': 42407,

releasenotes/notes/remove-chrony-image-20a96b0ce63e2959.yaml

@@ -0,0 +1,4 @@
+---
+upgrade:
+  - |
+    Support of building chrony image has been removed.