From 1cd8be82c0232045a0c2b2e4fba3e4a19fe822ee Mon Sep 17 00:00:00 2001 From: Steven Dake Date: Mon, 21 Mar 2016 15:32:35 -0700 Subject: [PATCH] Revert "Install master's version of an RDO keystone" This commit installed a custom built version of master RDO keystone. In order for the gate to pass, this custom built version needs to be reverted. This reverts commit c5f27aa8a69cffd4393ad56dbee1acd7ed5ba4bf. Change-Id: I440c38e485c1ee345c64b1172551bd5a11793716 --- 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 \