openstack/kolla-ansible
Code Issues Proposed changes

Merge "Drop root for Magnum"

Browse Source
This commit is contained in:
Jenkins 2015-11-18 00:50:40 +00:00 committed by Gerrit Code Review
commit 3e97fdf4d8
3 changed files with 5 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -14,3 +14,5 @@ COPY extend_start.sh /usr/local/bin/kolla_extend_start
RUN chmod 755 /usr/local/bin/kolla_extend_start RUN chmod 755 /usr/local/bin/kolla_extend_start
{{ include_footer }} {{ include_footer }}
USER magnum

2
docker/magnum/magnum-api/extend_start.sh
View File

@ -3,6 +3,6 @@
# Bootstrap and exit if KOLLA_BOOTSTRAP variable is set. This catches all cases # Bootstrap and exit if KOLLA_BOOTSTRAP variable is set. This catches all cases
# of the KOLLA_BOOTSTRAP variable being set, including empty. # of the KOLLA_BOOTSTRAP variable being set, including empty.
if [[ "${!KOLLA_BOOTSTRAP[@]}" ]]; then if [[ "${!KOLLA_BOOTSTRAP[@]}" ]]; then
sudo -H -u magnum magnum-db-manage upgrade magnum-db-manage upgrade
exit 0 exit 0
fi fi

2
docker/magnum/magnum-conductor/Dockerfile.j2
View File

@ -16,3 +16,5 @@ RUN cd /tmp && curl -L https://github.com/GoogleCloudPlatform/kubernetes/release
{% endif %} {% endif %}
{{ include_footer }} {{ include_footer }}
USER magnum