diff options
| author | Zuul <zuul@review.openstack.org> | 2017-11-13 01:00:55 +0000 |
|---|---|---|
| committer | Gerrit Code Review <review@openstack.org> | 2017-11-13 01:00:55 +0000 |
| commit | 8e11ab68d9f306592c7638e148acddfdb91807d4 (patch) | |
| tree | 66aa114eefe33c2a327c6955ab733ad92d527d1e | |
| parent | 905aa37f668a5190bcdc9d1e26527bd123864170 (diff) | |
| parent | 725c14c43e6d8bd23d4d1f8fbb756ee92f9cbd75 (diff) | |
| download | kolla-8e11ab68d9f306592c7638e148acddfdb91807d4.tar.gz kolla-8e11ab68d9f306592c7638e148acddfdb91807d4.zip | |
Merge "Add ptp service docker image"
| -rw-r--r-- | README.rst | 2 | ||||
| -rw-r--r-- | docker/ptp/Dockerfile.j2 | 16 | ||||
| -rw-r--r-- | docker/ptp/extend_start.sh | 12 | ||||
| -rwxr-xr-x | kolla/common/config.py | 1 | ||||
| -rw-r--r-- | releasenotes/notes/add-ptp-service-image-3fb4eadeeeda3aa0.yaml | 3 |
5 files changed, 34 insertions, 0 deletions
diff --git a/README.rst b/README.rst index b70d6d0da..d6ea3e87a 100644 --- a/README.rst +++ b/README.rst @@ -149,6 +149,8 @@ Kolla provides images to deploy the following infrastructure components: - `MongoDB <https://www.mongodb.org/>`__ as a database back end for Ceilometer and Gnocchi. - `Open vSwitch <http://openvswitch.org/>`__ and Linuxbridge back ends for Neutron. +- `Linuxptp <http://linuxptp.sourceforge.net/>`__ an implementation of the Precision + Time Protocol (PTP) according to IEEE standard 1588 for Linux. - `Qdrouterd <https://qpid.apache.org/components/dispatch-router/index.html>`__ as a direct messaging back end for communication between services. - `RabbitMQ <https://www.rabbitmq.com/>`__ as a broker messaging back end for diff --git a/docker/ptp/Dockerfile.j2 b/docker/ptp/Dockerfile.j2 new file mode 100644 index 000000000..474915188 --- /dev/null +++ b/docker/ptp/Dockerfile.j2 @@ -0,0 +1,16 @@ +FROM {{ namespace }}/{{ image_prefix }}base:{{ tag }} +LABEL maintainer="{{ maintainer }}" name="{{ image_name }}" build-date="{{ build_date }}" + +{% 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 new file mode 100644 index 000000000..09203991d --- /dev/null +++ b/docker/ptp/extend_start.sh @@ -0,0 +1,12 @@ +#!/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 51e13c26b..d4595a08e 100755 --- a/kolla/common/config.py +++ b/kolla/common/config.py @@ -71,6 +71,7 @@ _PROFILE_OPTS = [ 'mongodb', 'opendaylight', 'openvswitch', + 'ptp', 'qdrouterd', 'rabbitmq', 'redis', diff --git a/releasenotes/notes/add-ptp-service-image-3fb4eadeeeda3aa0.yaml b/releasenotes/notes/add-ptp-service-image-3fb4eadeeeda3aa0.yaml new file mode 100644 index 000000000..a4794ea9a --- /dev/null +++ b/releasenotes/notes/add-ptp-service-image-3fb4eadeeeda3aa0.yaml @@ -0,0 +1,3 @@ +--- +features: + - Add ptp service image |