diff options
| author | Jenkins <jenkins@review.openstack.org> | 2016-08-19 01:40:05 +0000 |
|---|---|---|
| committer | Gerrit Code Review <review@openstack.org> | 2016-08-19 01:40:05 +0000 |
| commit | 5d4636f9d6890cb339226a57a950cc472004035d (patch) | |
| tree | bd286263f22190ae13e717d5309e953d83bc16ee /docker | |
| parent | 1a316a805e050232a2aa3b78e98dbf186dfd0b31 (diff) | |
| parent | 4d6840c2a5d8cd96f19e49a9889ff8ea8ea64a16 (diff) | |
| download | kolla-5d4636f9d6890cb339226a57a950cc472004035d.tar.gz kolla-5d4636f9d6890cb339226a57a950cc472004035d.zip | |
Merge "Customizations for Senlin"
Diffstat (limited to 'docker')
| -rw-r--r-- | docker/senlin/senlin-api/Dockerfile.j2 | 2 | ||||
| -rw-r--r-- | docker/senlin/senlin-base/Dockerfile.j2 | 3 | ||||
| -rw-r--r-- | docker/senlin/senlin-engine/Dockerfile.j2 | 2 |
3 files changed, 7 insertions, 0 deletions
diff --git a/docker/senlin/senlin-api/Dockerfile.j2 b/docker/senlin/senlin-api/Dockerfile.j2 index db594e1c4..6be9fd8f0 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 cb3a4894f..9c6c783b9 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 565c71bf4..42d5f3cd0 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 |