Merge "Migrate to pyproject.toml"

3 files changed, 45 insertions, 0 deletions

diff --git a/kolla/docker/etcd/Dockerfile.j2 b/kolla/docker/etcd/Dockerfile.j2
new file mode 100644
index 000000000..aafcd8666
--- /dev/null
+++ b/kolla/docker/etcd/Dockerfile.j2
@@ -0,0 +1,31 @@
+FROM {{ namespace }}/{{ image_prefix }}base:{{ tag }}
+{% block labels %}
+LABEL maintainer="{{ maintainer }}" name="{{ image_name }}"
+{% endblock %}
+
+{% block etcd_header %}{% endblock %}
+
+{% import "macros.j2" as macros with context %}
+
+{{ macros.configure_user(name='etcd') }}
+
+{% block etcd_install %}
+ADD etcd-archive /etcd-source
+
+RUN ln -s etcd-source/* etcd \
+    && cp /etcd/etcd /etcd/etcdctl /usr/bin
+{% endblock %}
+
+COPY etcd_sudoers /etc/sudoers.d/kolla_etcd_sudoers
+COPY extend_start.sh /usr/local/bin/kolla_extend_start
+
+RUN chmod 644 /usr/local/bin/kolla_extend_start \
+    && chmod 750 /etc/sudoers.d \
+    && chmod 440 /etc/sudoers.d/kolla_etcd_sudoers
+
+{{ macros.kolla_patch_sources() }}
+
+{% block etcd_footer %}{% endblock %}
+{% block footer %}{% endblock %}
+
+USER etcd
diff --git a/kolla/docker/etcd/etcd_sudoers b/kolla/docker/etcd/etcd_sudoers
new file mode 100644
index 000000000..d3e244be0
--- /dev/null
+++ b/kolla/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/kolla/docker/etcd/extend_start.sh b/kolla/docker/etcd/extend_start.sh
new file mode 100644
index 000000000..c54023299
--- /dev/null
+++ b/kolla/docker/etcd/extend_start.sh
@@ -0,0 +1,13 @@
+#!/bin/bash
+
+# Create log directory, with appropriate permissions
+if [[ ! -d "/var/log/kolla/etcd" ]]; then
+    mkdir -p /var/log/kolla/etcd
+fi
+if [[ $(stat -c %a /var/log/kolla/etcd) != "755" ]]; then
+    chmod 755 /var/log/kolla/etcd
+fi
+
+if [[ $(stat -c %U /var/lib/etcd/) != "etcd" ]]; then
+    sudo chown etcd: /var/lib/etcd/
+fi