openstack/kolla-ansible
Code Issues Proposed changes

Merge "Customizations for Senlin"

Browse Source
This commit is contained in:
Jenkins 2016-08-19 01:40:05 +00:00 committed by Gerrit Code Review
commit 5d4636f9d6
3 changed files with 7 additions and 0 deletions
docker/senlin
senlin-api
Dockerfile.j2
senlin-base
Dockerfile.j2
senlin-engine
Dockerfile.j2

2
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

3
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 %}

2
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