diff options
| author | Jenkins <jenkins@review.openstack.org> | 2016-03-11 22:52:28 +0000 |
|---|---|---|
| committer | Gerrit Code Review <review@openstack.org> | 2016-03-11 22:52:28 +0000 |
| commit | ab6e2ebac6cdce3a2e3de533c99aaa6773ff129e (patch) | |
| tree | dfa723ce312e9088a762c72068dffae29301f03f /docker | |
| parent | d484f40fc8c671b8ff3e1caf37afdb416db23020 (diff) | |
| parent | c5f27aa8a69cffd4393ad56dbee1acd7ed5ba4bf (diff) | |
| download | kolla-ab6e2ebac6cdce3a2e3de533c99aaa6773ff129e.tar.gz kolla-ab6e2ebac6cdce3a2e3de533c99aaa6773ff129e.zip | |
Merge "Install master's version of an RDO keystone"
Diffstat (limited to 'docker')
| -rw-r--r-- | docker/keystone/Dockerfile.j2 | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/docker/keystone/Dockerfile.j2 b/docker/keystone/Dockerfile.j2 index 4c23875a1..b37a21ff9 100644 --- a/docker/keystone/Dockerfile.j2 +++ b/docker/keystone/Dockerfile.j2 @@ -4,7 +4,9 @@ MAINTAINER {{ maintainer }} {% if install_type == 'binary' %} {% if base_distro in ['fedora', 'centos', 'oraclelinux', 'rhel'] %} -RUN yum -y install openstack-keystone \ +# 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 \ python-keystoneclient \ httpd \ mod_wsgi \ |
