openstack/kolla-ansible
Code Issues Proposed changes

Merge "Allow operators to customise keystone source install"

Browse Source
This commit is contained in:
Jenkins 2016-09-16 14:20:44 +00:00 committed by Gerrit Code Review
commit be3d63dbfa
1 changed files with 3 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
docker/keystone/keystone-base/Dockerfile.j2
View File

@ -58,6 +58,7 @@ RUN echo > /etc/apache2/ports.conf
{% endif %}
{% block keystone_source_install %}
ADD keystone-base-archive /keystone-base-source
RUN ln -s keystone-base-source/* keystone \
&& useradd --user-group keystone \
@ -67,6 +68,7 @@ RUN ln -s keystone-base-source/* keystone \
&& cp /var/lib/kolla/venv/bin/keystone-wsgi-admin /var/www/cgi-bin/keystone/admin \
&& cp /var/lib/kolla/venv/bin/keystone-wsgi-public /var/www/cgi-bin/keystone/main \
&& chown -R keystone: /etc/keystone /var/www/cgi-bin/keystone /var/log/apache2 /home/keystone
{% endblock %}
{% endif %}