diff options
| author | Jenkins <jenkins@review.openstack.org> | 2016-02-14 19:36:53 +0000 |
|---|---|---|
| committer | Gerrit Code Review <review@openstack.org> | 2016-02-14 19:36:53 +0000 |
| commit | d346545922fa3dfda742a9acc6ca6e9f140786ab (patch) | |
| tree | 3630b4a9b9de10b3aa59524741f477a466c6d49b | |
| parent | 1733a701dda436d98d9fb447f245364e40f23f11 (diff) | |
| parent | 8ef7434770846e81aa04009838bd1df69cc29ac8 (diff) | |
| download | kolla-d346545922fa3dfda742a9acc6ca6e9f140786ab.tar.gz kolla-d346545922fa3dfda742a9acc6ca6e9f140786ab.zip | |
Merge "Fix keystone initial auth mechanism"
| -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/* |