diff options
| author | Jenkins <jenkins@review.openstack.org> | 2016-11-04 12:38:35 +0000 |
|---|---|---|
| committer | Gerrit Code Review <review@openstack.org> | 2016-11-04 12:38:35 +0000 |
| commit | d25ddf87f3f74c9889e303a9e139296fe70f04dc (patch) | |
| tree | 56dae67f4347450637e2f5ac3e5bfbf6ee58aa20 | |
| parent | ebc2e2f1c1aa398de66ed88cb41c3d2edd24ea73 (diff) | |
| parent | 86a5c8cb79e9a006696012efd4f0f6bbea25cd16 (diff) | |
| download | kolla-d25ddf87f3f74c9889e303a9e139296fe70f04dc.tar.gz kolla-d25ddf87f3f74c9889e303a9e139296fe70f04dc.zip | |
Merge "Add chrony docker image"
| -rw-r--r-- | docker/chrony/Dockerfile.j2 | 23 | ||||
| -rw-r--r-- | docker/chrony/extend_start.sh | 10 | ||||
| -rw-r--r-- | kolla/common/config.py | 12 |
3 files changed, 39 insertions, 6 deletions
diff --git a/docker/chrony/Dockerfile.j2 b/docker/chrony/Dockerfile.j2 new file mode 100644 index 000000000..8443bcc4e --- /dev/null +++ b/docker/chrony/Dockerfile.j2 @@ -0,0 +1,23 @@ +FROM {{ namespace }}/{{ image_prefix }}base:{{ tag }} +MAINTAINER {{ maintainer }} + +{% block chrony_header %}{% endblock %} + +{% import "macros.j2" as macros with context %} + +{% set chrony_packages = ['chrony'] %} + +{% if base_distro in ['ubuntu', 'debian'] %} +# Ubuntu use _chrony username to use unified running user with RHEL system +RUN useradd --user-group --create-home --home-dir /var/lib/chrony chrony +{% endif %} + +{{ 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 \ + && usermod -a -G kolla chrony + +{% block chrony_footer %}{% endblock %} +{% block footer %}{% endblock %} +{{ include_footer }} diff --git a/docker/chrony/extend_start.sh b/docker/chrony/extend_start.sh new file mode 100644 index 000000000..80af48dba --- /dev/null +++ b/docker/chrony/extend_start.sh @@ -0,0 +1,10 @@ +#!/bin/bash + +rm -f /var/run/chronyd.pid + +if [[ ! -d "/var/log/kolla/chrony" ]]; then + mkdir -p /var/log/kolla/chrony +fi +if [[ $(stat -c %a /var/log/kolla/chrony) != "755" ]]; then + chmod 755 /var/log/kolla/chrony +fi diff --git a/kolla/common/config.py b/kolla/common/config.py index 5c00f6837..2a990f512 100644 --- a/kolla/common/config.py +++ b/kolla/common/config.py @@ -52,15 +52,15 @@ _PROFILE_OPTS = [ 'zaqar'], help='Aux Images'), cfg.ListOpt('default', - default=['cron', 'kolla-toolbox', 'glance', 'haproxy', - 'heat', 'horizon', 'keepalived', 'keystone', - 'memcached', 'mariadb', 'neutron', 'nova', + default=['chrony', 'cron', 'kolla-toolbox', 'glance', + 'haproxy', 'heat', 'horizon', 'keepalived', + 'keystone', 'memcached', 'mariadb', 'neutron', 'nova', 'openvswitch', 'rabbitmq', 'heka'], help='Default images'), cfg.ListOpt('gate', - default=['cron', 'glance', 'haproxy', 'keepalived', 'keystone', - 'kolla-toolbox', 'mariadb', 'memcached', 'neutron', - 'nova', 'openvswitch', 'rabbitmq', 'heka'], + default=['chrony', 'cron', 'glance', 'haproxy', 'keepalived', + 'keystone', 'kolla-toolbox', 'mariadb', 'memcached', + 'neutron', 'nova', 'openvswitch', 'rabbitmq', 'heka'], help='Gate images') ] |