From 893f14812ddbd0517fb66fce9f0f69023ff93c1b Mon Sep 17 00:00:00 2001
From: Paul Bourke <paul.bourke@oracle.com>
Date: Fri, 16 Sep 2016 11:11:32 +0100
Subject: [PATCH] Allow operators to customise keystone source install
TrivialFix
Change-Id: I5fb6e2b72e56e018ed640811a9f4d1d77a3efb11
---
docker/keystone/keystone-base/Dockerfile.j2 | 4 +++-
1 file changed, 3 insertions(+), 1 deletion(-)
diff --git a/docker/keystone/keystone-base/Dockerfile.j2 b/docker/keystone/keystone-base/Dockerfile.j2
index 6f5a40fdd7..bd583e8033 100644
--- a/docker/keystone/keystone-base/Dockerfile.j2
+++ b/docker/keystone/keystone-base/Dockerfile.j2
@@ -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 %}
@@ -76,4 +78,4 @@ RUN usermod -a -G kolla keystone \
{% block keystone_base_footer %}{% endblock %}
{% block footer %}{% endblock %}
-{{ include_footer }}
\ No newline at end of file
+{{ include_footer }}