diff options
| author | Jenkins <jenkins@review.openstack.org> | 2016-08-26 16:10:25 +0000 |
|---|---|---|
| committer | Gerrit Code Review <review@openstack.org> | 2016-08-26 16:10:25 +0000 |
| commit | 6f5703eb5dbff565f510c3a9d67d3e698eed535f (patch) | |
| tree | d33e3aa2d1ca232f4d86f5a7b9393600c39d2745 /docker | |
| parent | ca100f1f3206daf5aeccaa58bad5b97ef22f4e30 (diff) | |
| parent | c096825075baf278f0319f194604f3c2a6ab21ec (diff) | |
| download | kolla-6f5703eb5dbff565f510c3a9d67d3e698eed535f.tar.gz kolla-6f5703eb5dbff565f510c3a9d67d3e698eed535f.zip | |
Merge "Add etcd container"
Diffstat (limited to 'docker')
| -rw-r--r-- | docker/etcd/Dockerfile.j2 | 25 | ||||
| -rw-r--r-- | docker/etcd/etcd_sudoers | 1 | ||||
| -rw-r--r-- | docker/etcd/extend_start.sh | 8 |
3 files changed, 34 insertions, 0 deletions
diff --git a/docker/etcd/Dockerfile.j2 b/docker/etcd/Dockerfile.j2 new file mode 100644 index 000000000..d03df4131 --- /dev/null +++ b/docker/etcd/Dockerfile.j2 @@ -0,0 +1,25 @@ +FROM {{ namespace }}/{{ image_prefix }}base:{{ tag }} +MAINTAINER {{ maintainer }} + +{% import "macros.j2" as macros with context %} + +{% if base_distro in ['centos', 'fedora', 'oraclelinux', 'rhel'] %} + {% set etcd_packages = ['etcd'] %} +{% elif base_distro in ['ubuntu', 'debian'] %} + {% set etcd_packages = ['etcd'] %} +{% endif %} +{{ macros.install_packages(etcd_packages | customizable("packages")) }} + +COPY etcd_sudoers /etc/sudoers.d/etcd_sudoers +COPY extend_start.sh /usr/local/bin/kolla_extend_start + +RUN chmod 755 /usr/local/bin/kolla_extend_start \ + && chmod 750 /etc/sudoers.d \ + && chmod 440 /etc/sudoers.d/etcd_sudoers \ + && usermod -a -G kolla etcd + +{% block etcd_footer %}{% endblock %} +{% block footer %}{% endblock %} +{{ include_footer }} + +USER etcd diff --git a/docker/etcd/etcd_sudoers b/docker/etcd/etcd_sudoers new file mode 100644 index 000000000..d3e244be0 --- /dev/null +++ b/docker/etcd/etcd_sudoers @@ -0,0 +1 @@ +%kolla ALL=(root) NOPASSWD: /usr/bin/chown etcd\: /var/lib/etcd/, /bin/chown etcd\: /var/lib/etcd/ diff --git a/docker/etcd/extend_start.sh b/docker/etcd/extend_start.sh new file mode 100644 index 000000000..485ee8e2d --- /dev/null +++ b/docker/etcd/extend_start.sh @@ -0,0 +1,8 @@ +#!/bin/bash + +# Bootstrap and exit if KOLLA_BOOTSTRAP variable is set. This catches all cases +# of the KOLLA_BOOTSTRAP variable being set, including empty. +if [[ "${!KOLLA_BOOTSTRAP[@]}" ]]; then + sudo chown etcd: /var/lib/etcd/ + exit 0 +fi |