diff options
| author | Steven Dake <stdake@cisco.com> | 2016-03-30 10:04:16 -0700 |
|---|---|---|
| committer | Jeffrey Zhang <jeffrey.zhang@99cloud.net> | 2016-05-09 07:29:54 +0000 |
| commit | 2a12fbf5888879d11d7610dafd967e161be007a9 (patch) | |
| tree | 61bc8f084953d0deb49cb17c8a08c779c892999b /docker/keystone | |
| parent | fcdf187337d6741e805741822650ff98c02f74fa (diff) | |
| download | kolla-2a12fbf5888879d11d7610dafd967e161be007a9.tar.gz kolla-2a12fbf5888879d11d7610dafd967e161be007a9.zip | |
Revert "Install master's version of an RDO keystone"
This was a temporary workaround because RDO didn't update to
keystone bootstrap command operations.
This reverts commit c5f27aa8a69cffd4393ad56dbee1acd7ed5ba4bf.
Closes-Bug: #1573102
Change-Id: Ic6db97cf15d6f96c8e660aa15f089c1f10d6dfa7
Diffstat (limited to 'docker/keystone')
| -rw-r--r-- | docker/keystone/Dockerfile.j2 | 4 |
1 files changed, 1 insertions, 3 deletions
diff --git a/docker/keystone/Dockerfile.j2 b/docker/keystone/Dockerfile.j2 index b37a21ff9..4c23875a1 100644 --- a/docker/keystone/Dockerfile.j2 +++ b/docker/keystone/Dockerfile.j2 @@ -4,9 +4,7 @@ MAINTAINER {{ maintainer }} {% if install_type == 'binary' %} {% if base_distro in ['fedora', 'centos', 'oraclelinux', 'rhel'] %} -# TODO(sdake)Revert this change before release of Mitaka -RUN yum -y install https://copr-be.cloud.fedoraproject.org/results/sdake/Keystone/epel-7-x86_64/00167586-openstack-keystone/openstack-keystone-9.0.0-0.sdake.el7.centos.noarch.rpm \ - https://copr-be.cloud.fedoraproject.org/results/sdake/Keystone/epel-7-x86_64/00167586-openstack-keystone/python-keystone-9.0.0-0.sdake.el7.centos.noarch.rpm \ +RUN yum -y install openstack-keystone \ python-keystoneclient \ httpd \ mod_wsgi \ |