diff options
| author | Jenkins <jenkins@review.openstack.org> | 2016-05-12 12:22:29 +0000 |
|---|---|---|
| committer | Gerrit Code Review <review@openstack.org> | 2016-05-12 12:22:29 +0000 |
| commit | 0977601ea5d90ff5d3579ea2b4f97330fe5e3e76 (patch) | |
| tree | 14b523ac9f4f67a1d9066fa81e83ac48beac9ca6 /docker | |
| parent | f6e1786563dda98f39190f5e1844eea1bea2812c (diff) | |
| parent | 2a12fbf5888879d11d7610dafd967e161be007a9 (diff) | |
| download | kolla-0977601ea5d90ff5d3579ea2b4f97330fe5e3e76.tar.gz kolla-0977601ea5d90ff5d3579ea2b4f97330fe5e3e76.zip | |
Merge "Revert "Install master's version of an RDO keystone""
Diffstat (limited to 'docker')
| -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 f7359dd25..65b1eab63 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 \ |