diff options
| -rw-r--r-- | README.rst | 2 | ||||
| -rw-r--r-- | doc/source/matrix_aarch64.csv | 1 | ||||
| -rw-r--r-- | doc/source/matrix_x86.csv | 1 | ||||
| -rw-r--r-- | docker/ptp/Dockerfile.j2 | 18 | ||||
| -rw-r--r-- | docker/ptp/extend_start.sh | 12 | ||||
| -rwxr-xr-x | kolla/common/config.py | 1 | ||||
| -rw-r--r-- | releasenotes/notes/remove-ptp-image-0611c1d2da5d440f.yaml | 3 |
7 files changed, 3 insertions, 35 deletions
diff --git a/README.rst b/README.rst index b2bad66d1..126739e47 100644 --- a/README.rst +++ b/README.rst @@ -143,8 +143,6 @@ Kolla provides images to deploy the following infrastructure components: for highly available MySQL databases. - `Memcached <https://www.memcached.org/>`__ a distributed memory object caching system. - `Open vSwitch <https://www.openvswitch.org/>`__ and Linuxbridge back ends for Neutron. -- `Linux ptp <http://linuxptp.sourceforge.net/>`__ an implementation of the Precision - Time Protocol (PTP) according to IEEE standard 1588 for Linux. - MariaDB Backup A tool which provides a method of performing a hot backup of your MySQL data while the system is running. - `Prometheus <https://prometheus.io/>`__ an open-source systems monitoring diff --git a/doc/source/matrix_aarch64.csv b/doc/source/matrix_aarch64.csv index 1cf1e7c4f..209154a56 100644 --- a/doc/source/matrix_aarch64.csv +++ b/doc/source/matrix_aarch64.csv @@ -59,7 +59,6 @@ ovsdpdk,N,N,C,C,N,N panko,C,C,C,C,N,C placement,C,C,N,C,N,C prometheus,C,C,C,C,N,C -ptp (deprecated),C,C,C,C,N,C qdrouterd,C,C,C,C,N,N rabbitmq,C,C,C,C,N,C radvd (deprecated),C,C,C,C,N,C diff --git a/doc/source/matrix_x86.csv b/doc/source/matrix_x86.csv index b868065ae..11ab46fa3 100644 --- a/doc/source/matrix_x86.csv +++ b/doc/source/matrix_x86.csv @@ -60,7 +60,6 @@ ovsdpdk,N,N,C,C,N,N panko,C,C,C,C,C,C placement,T,T,T,T,C,T prometheus,C,C,C,C,C,C -ptp (deprecated),C,C,C,C,C,C qdrouterd,C,C,N,N,N,N rabbitmq,T,T,T,T,C,T radvd (deprecated),C,C,C,C,C,C diff --git a/docker/ptp/Dockerfile.j2 b/docker/ptp/Dockerfile.j2 deleted file mode 100644 index c6cc8aaba..000000000 --- a/docker/ptp/Dockerfile.j2 +++ /dev/null @@ -1,18 +0,0 @@ -FROM {{ namespace }}/{{ infra_image_prefix }}base:{{ tag }} -{% block labels %} -LABEL maintainer="{{ maintainer }}" name="{{ image_name }}" build-date="{{ build_date }}" -{% endblock %} - -{% block ptp_header %}{% endblock %} - -{% import "macros.j2" as macros with context %} - -{% set ptp_packages = ['linuxptp'] %} - -{{ macros.install_packages(ptp_packages | customizable("packages")) }} - -COPY extend_start.sh /usr/local/bin/kolla_extend_start -RUN chmod 755 /usr/local/bin/kolla_extend_start - -{% block ptp_footer %}{% endblock %} -{% block footer %}{% endblock %} diff --git a/docker/ptp/extend_start.sh b/docker/ptp/extend_start.sh deleted file mode 100644 index 09203991d..000000000 --- a/docker/ptp/extend_start.sh +++ /dev/null @@ -1,12 +0,0 @@ -#!/bin/bash - -rm -f /var/run/ptp.pid - -PTP_LOG_DIR="/var/log/kolla/ptp" -if [[ ! -d "${PTP_LOG_DIR}" ]]; then - mkdir -p ${PTP_LOG_DIR} -fi - -if [[ $(stat -c %a ${PTP_LOG_DIR}) != "755" ]]; then - chmod 755 ${PTP_LOG_DIR} -fi diff --git a/kolla/common/config.py b/kolla/common/config.py index 27cf262ea..35a1facf5 100755 --- a/kolla/common/config.py +++ b/kolla/common/config.py @@ -64,7 +64,6 @@ _PROFILE_OPTS = [ 'mariadb', 'memcached', 'openvswitch', - 'ptp', 'qdrouterd', 'rabbitmq', 'redis', diff --git a/releasenotes/notes/remove-ptp-image-0611c1d2da5d440f.yaml b/releasenotes/notes/remove-ptp-image-0611c1d2da5d440f.yaml new file mode 100644 index 000000000..5e80323c0 --- /dev/null +++ b/releasenotes/notes/remove-ptp-image-0611c1d2da5d440f.yaml @@ -0,0 +1,3 @@ +--- +upgrade: + - The ``ptp`` image is removed per the deprecation cycle. |