From 4d6840c2a5d8cd96f19e49a9889ff8ea8ea64a16 Mon Sep 17 00:00:00 2001
From: Eduardo Gonzalez <dabarren@gmail.com>
Date: Sat, 6 Aug 2016 11:23:02 +0200
Subject: [PATCH] Customizations for Senlin
This patchset contains customization of Dockerfile of Senlin
containers
Change-Id: I0f8269f5eff1ccf6881d46f6082830f3e586d945
Partially-implements: blueprint third-party-plugin-support
Signed-off-by: Eduardo Gonzalez <dabarren@gmail.com>
---
docker/senlin/senlin-api/Dockerfile.j2 | 2 ++
docker/senlin/senlin-base/Dockerfile.j2 | 3 +++
docker/senlin/senlin-engine/Dockerfile.j2 | 2 ++
3 files changed, 7 insertions(+)
diff --git a/docker/senlin/senlin-api/Dockerfile.j2 b/docker/senlin/senlin-api/Dockerfile.j2
index db594e1c47..6be9fd8f06 100644
--- a/docker/senlin/senlin-api/Dockerfile.j2
+++ b/docker/senlin/senlin-api/Dockerfile.j2
@@ -11,6 +11,8 @@ RUN echo '{{ install_type }} not yet available for {{ base_distro }}' \
COPY extend_start.sh /usr/local/bin/kolla_senlin_extend_start
RUN chmod 755 /usr/local/bin/kolla_senlin_extend_start
+{% block senlin_api_footer %}{% endblock %}
+{% block footer %}{% endblock %}
{{ include_footer }}
USER senlin
diff --git a/docker/senlin/senlin-base/Dockerfile.j2 b/docker/senlin/senlin-base/Dockerfile.j2
index cb3a4894f0..9c6c783b9e 100644
--- a/docker/senlin/senlin-base/Dockerfile.j2
+++ b/docker/senlin/senlin-base/Dockerfile.j2
@@ -23,3 +23,6 @@ COPY extend_start.sh /usr/local/bin/kolla_extend_start
RUN usermod -a -G kolla senlin \
&& touch /usr/local/bin/kolla_senlin_extend_start \
&& chmod 755 /usr/local/bin/kolla_extend_start /usr/local/bin/kolla_senlin_extend_start
+
+{% block senlin_base_footer %}{% endblock %}
+{% block footer %}{% endblock %}
diff --git a/docker/senlin/senlin-engine/Dockerfile.j2 b/docker/senlin/senlin-engine/Dockerfile.j2
index 565c71bf4f..42d5f3cd03 100644
--- a/docker/senlin/senlin-engine/Dockerfile.j2
+++ b/docker/senlin/senlin-engine/Dockerfile.j2
@@ -8,6 +8,8 @@ RUN echo '{{ install_type }} not yet available for {{ base_distro }}' \
{% endif %}
+{% block senlin_engine_footer %}{% endblock %}
+{% block footer %}{% endblock %}
{{ include_footer }}
USER senlin