diff options
| author | jackning <ningyougang@navercorp.com> | 2016-11-23 17:15:28 +0800 |
|---|---|---|
| committer | jackning <ningyougang@navercorp.com> | 2016-11-24 10:11:40 +0800 |
| commit | 06b473932d1fd26c213c7f71c59139873b9db50f (patch) | |
| tree | 6070b9e1c23406e4c27f66af84971a861158ada0 /docker | |
| parent | e1ec29bdb2cf5cf674f73b98be1571cf0a50a98b (diff) | |
| download | kolla-06b473932d1fd26c213c7f71c59139873b9db50f.tar.gz kolla-06b473932d1fd26c213c7f71c59139873b9db50f.zip | |
Support adding customized plugin to keystone image
Kolla supports adding plugin to horizon and neutron-server images now,
but it doesn't support adding plugin to keystone image.
As keystone itself supports adding authentication plugins, there is a
good chance that user may implement their own plugins for keystone
authentication and identity. It would be better that kolla supports
adding plugin for keystone image just the way like horizon and neutron-server.
Change-Id: Id75c387668c6277efae05b59063f226843aa2a25
Closes-Bug: #1644133
Diffstat (limited to 'docker')
| -rw-r--r-- | docker/keystone/keystone/Dockerfile.j2 | 6 |
1 files changed, 5 insertions, 1 deletions
diff --git a/docker/keystone/keystone/Dockerfile.j2 b/docker/keystone/keystone/Dockerfile.j2 index 761be7893..5a835a9f6 100644 --- a/docker/keystone/keystone/Dockerfile.j2 +++ b/docker/keystone/keystone/Dockerfile.j2 @@ -3,9 +3,13 @@ MAINTAINER {{ maintainer }} {% block keystone_header %}{% endblock %} +ADD plugins-archive / COPY keystone_bootstrap.sh /usr/local/bin/kolla_keystone_bootstrap COPY extend_start.sh /usr/local/bin/kolla_extend_start -RUN chmod 755 /usr/local/bin/kolla_extend_start /usr/local/bin/kolla_keystone_bootstrap +RUN chmod 755 /usr/local/bin/kolla_extend_start /usr/local/bin/kolla_keystone_bootstrap \ + && if [ "$(ls /plugins)" ]; then \ + pip --no-cache-dir install --upgrade -c requirements/upper-constraints.txt /plugins/*; \ + fi {% block keystone_footer %}{% endblock %} {% block footer %}{% endblock %} |