diff options
| author | Jenkins <jenkins@review.openstack.org> | 2016-09-16 14:20:44 +0000 |
|---|---|---|
| committer | Gerrit Code Review <review@openstack.org> | 2016-09-16 14:20:44 +0000 |
| commit | be3d63dbfa6c60ac9f31f558ece4f7588cf7fa2a (patch) | |
| tree | 6f2f53eac979a0b6dae5b7c4f1ac7d3190fb9ea8 | |
| parent | f9956f2e103d8e95720b8312e6fdca18182d69a3 (diff) | |
| parent | 893f14812ddbd0517fb66fce9f0f69023ff93c1b (diff) | |
| download | kolla-be3d63dbfa6c60ac9f31f558ece4f7588cf7fa2a.tar.gz kolla-be3d63dbfa6c60ac9f31f558ece4f7588cf7fa2a.zip | |
Merge "Allow operators to customise keystone source install"
| -rw-r--r-- | docker/keystone/keystone-base/Dockerfile.j2 | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/docker/keystone/keystone-base/Dockerfile.j2 b/docker/keystone/keystone-base/Dockerfile.j2 index 6f5a40fdd..bd583e803 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 }} |