diff options
| author | Jenkins <jenkins@review.openstack.org> | 2016-03-01 06:11:43 +0000 |
|---|---|---|
| committer | Gerrit Code Review <review@openstack.org> | 2016-03-01 06:11:43 +0000 |
| commit | 31a7e37f0916724f2d3c0382966ac02508ea7f69 (patch) | |
| tree | b414116b327b0ade23c85235b94a9e2e0ac63d83 /docker/keystone/Dockerfile.j2 | |
| parent | 1e68e445db3e70046d616283f1ed8f884cab0b1d (diff) | |
| parent | 4edd0baf8d0356538e7d3016b17297e7c34900d4 (diff) | |
| download | kolla-31a7e37f0916724f2d3c0382966ac02508ea7f69.tar.gz kolla-31a7e37f0916724f2d3c0382966ac02508ea7f69.zip | |
Merge "Remove keystone admin token"
Diffstat (limited to 'docker/keystone/Dockerfile.j2')
| -rw-r--r-- | docker/keystone/Dockerfile.j2 | 8 |
1 files changed, 2 insertions, 6 deletions
diff --git a/docker/keystone/Dockerfile.j2 b/docker/keystone/Dockerfile.j2 index b893ce478..4c23875a1 100644 --- a/docker/keystone/Dockerfile.j2 +++ b/docker/keystone/Dockerfile.j2 @@ -60,16 +60,12 @@ 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 usermod -a -G kolla keystone \ && chown -R keystone: /var/www/cgi-bin/keystone \ && chmod 755 /var/www/cgi-bin/keystone/* +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 +RUN chmod 755 /usr/local/bin/kolla_extend_start /usr/local/bin/kolla_keystone_bootstrap {{ include_footer }} |
