diff options
| author | SamYaple <sam@yaple.net> | 2016-02-13 16:46:58 +0000 |
|---|---|---|
| committer | Steven Dake <stdake@cisco.com> | 2016-02-14 08:59:13 -0700 |
| commit | 8ef7434770846e81aa04009838bd1df69cc29ac8 (patch) | |
| tree | 420f4f81b1cb59171d5e63fdcd0dd3d46c5a5396 /docker | |
| parent | 03568ce863f84da54d7e52af996d4f48c1c5c387 (diff) | |
| download | kolla-8ef7434770846e81aa04009838bd1df69cc29ac8.tar.gz kolla-8ef7434770846e81aa04009838bd1df69cc29ac8.zip | |
Fix keystone initial auth mechanism
A recent change in keystone [1] has deprecated the token auth
mechanism that we used. We reintroduce it temporarily while a more
permanant solution is worked on.
[1] https://github.com/openstack/keystone/commit/5286b4a297b5a94895a311a9e564aa87cb54dbfd
Change-Id: I4d585733a9abd201c1b0680e6196dd2a36db3c7e
Closes-Bug: #1545292
Diffstat (limited to 'docker')
| -rw-r--r-- | docker/keystone/Dockerfile.j2 | 5 |
1 files changed, 5 insertions, 0 deletions
diff --git a/docker/keystone/Dockerfile.j2 b/docker/keystone/Dockerfile.j2 index fa36801bc..b00b72a5f 100644 --- a/docker/keystone/Dockerfile.j2 +++ b/docker/keystone/Dockerfile.j2 @@ -61,6 +61,11 @@ RUN ln -s keystone-source/* keystone \ {% endif %} +# NOTE(SamYaple): This is to reintroduce a deprecated option as a quick-fix +# until the correct new procedure is implemented. +# TODO(SamYaple): Replace this with `keystone-manage bootstrap` +RUN sed -i 's|token_auth json_body|token_auth admin_token_auth json_body|g' /etc/keystone/keystone-paste.ini + RUN chown -R keystone: /var/www/cgi-bin/keystone \ && chmod 755 /var/www/cgi-bin/keystone/* |