openstack/kolla-ansible
Code Issues Proposed changes

Merge "Revert "Install master's version of an RDO keystone""

Browse Source
This commit is contained in:
Jenkins 2016-05-12 12:22:29 +00:00 committed by Gerrit Code Review
commit 0977601ea5
1 changed files with 1 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
docker/keystone/Dockerfile.j2
View File

@ -4,9 +4,7 @@ MAINTAINER {{ maintainer }}
{% if install_type == 'binary' %} {% if install_type == 'binary' %}
{% if base_distro in ['fedora', 'centos', 'oraclelinux', 'rhel'] %} {% if base_distro in ['fedora', 'centos', 'oraclelinux', 'rhel'] %}
# TODO(sdake)Revert this change before release of Mitaka RUN yum -y install openstack-keystone \
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 \
python-keystoneclient \ python-keystoneclient \
httpd \ httpd \
mod_wsgi \ mod_wsgi \