openstack/kolla-ansible
Code Issues Proposed changes

Merge "Customizations for Watcher"

Browse Source
This commit is contained in:
Jenkins 2016-08-11 20:50:33 +00:00 committed by Gerrit Code Review
commit 56cab3c7ea
4 changed files with 10 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
docker/watcher/watcher-api/Dockerfile.j2
View File

@ -11,6 +11,8 @@ RUN echo '{{ install_type }} not yet available for {{ base_distro }}' \
COPY extend_start.sh /usr/local/bin/kolla_watcher_extend_start COPY extend_start.sh /usr/local/bin/kolla_watcher_extend_start
RUN chmod 755 /usr/local/bin/kolla_watcher_extend_start RUN chmod 755 /usr/local/bin/kolla_watcher_extend_start
{% block watcher_api_footer %}{% endblock %}
{% block footer %}{% endblock %}
{{ include_footer }} {{ include_footer }}
USER watcher USER watcher

2
docker/watcher/watcher-applier/Dockerfile.j2
View File

@ -8,6 +8,8 @@ RUN echo '{{ install_type }} not yet available for {{ base_distro }}' \
{% endif %} {% endif %}
{% block watcher_applier_footer %}{% endblock %}
{% block footer %}{% endblock %}
{{ include_footer }} {{ include_footer }}
USER watcher USER watcher

4
docker/watcher/watcher-base/Dockerfile.j2
View File

@ -25,3 +25,7 @@ COPY extend_start.sh /usr/local/bin/kolla_extend_start
RUN usermod -a -G kolla watcher \ RUN usermod -a -G kolla watcher \
&& touch /usr/local/bin/kolla_watcher_extend_start \ && touch /usr/local/bin/kolla_watcher_extend_start \
&& chmod 755 /usr/local/bin/kolla_extend_start /usr/local/bin/kolla_watcher_extend_start && chmod 755 /usr/local/bin/kolla_extend_start /usr/local/bin/kolla_watcher_extend_start
{% block watcher_base_footer %}{% endblock %}
{% block footer %}{% endblock %}
{{ include_footer }}

2
docker/watcher/watcher-engine/Dockerfile.j2
View File

@ -8,6 +8,8 @@ RUN echo '{{ install_type }} not yet available for {{ base_distro }}' \
{% endif %} {% endif %}
{% block watcher_engine_footer %}{% endblock %}
{% block footer %}{% endblock %}
{{ include_footer }} {{ include_footer }}
USER watcher USER watcher