From 2a12fbf5888879d11d7610dafd967e161be007a9 Mon Sep 17 00:00:00 2001
From: Steven Dake <stdake@cisco.com>
Date: Wed, 30 Mar 2016 10:04:16 -0700
Subject: [PATCH] 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
---
docker/keystone/Dockerfile.j2 | 4 +---
1 file changed, 1 insertion(+), 3 deletions(-)
diff --git a/docker/keystone/Dockerfile.j2 b/docker/keystone/Dockerfile.j2
index b37a21ff9d..4c23875a1e 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 \