Merge "Add etcd container"

This commit is contained in:
Jenkins 2016-08-26 16:10:25 +00:00 committed by Gerrit Code Review
commit 6f5703eb5d
5 changed files with 38 additions and 1 deletions

25
docker/etcd/Dockerfile.j2 Normal file
View File

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

1
docker/etcd/etcd_sudoers Normal file
View File

@ -0,0 +1 @@
%kolla ALL=(root) NOPASSWD: /usr/bin/chown etcd\: /var/lib/etcd/, /bin/chown etcd\: /var/lib/etcd/

View File

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

View File

@ -34,7 +34,7 @@ INSTALL_TYPE_CHOICES = ['binary', 'source', 'rdo', 'rhos']
_PROFILE_OPTS = [
cfg.ListOpt('infra',
default=['ceph', 'cron', 'mariadb', 'haproxy',
default=['ceph', 'cron', 'etcd', 'mariadb', 'haproxy',
'keepalived', 'kolla-toolbox', 'memcached',
'mongodb', 'openvswitch', 'rabbitmq', 'heka'],
help='Infra images'),

View File

@ -0,0 +1,3 @@
---
features:
- Add etcd docker container