aboutsummaryrefslogtreecommitdiff
path: root/docker
diff options
context:
space:
mode:
authorJenkins <jenkins@review.openstack.org>2015-11-11 22:59:19 +0000
committerGerrit Code Review <review@openstack.org>2015-11-11 22:59:19 +0000
commitb6212875d3c40ad10f7c599987559fac30248cec (patch)
tree325f43c109720ad7a67be3f62b149bf1a4efe7f2 /docker
parentd9f49d10267637224e9beedc0b2f0b811a483560 (diff)
parent87c5b6b86b84c194c41566a31ee378960600f656 (diff)
downloadkolla-b6212875d3c40ad10f7c599987559fac30248cec.tar.gz
kolla-b6212875d3c40ad10f7c599987559fac30248cec.zip
Merge "Install keystoneauthv1 in openstack-base image"
Diffstat (limited to 'docker')
-rw-r--r--docker/horizon/Dockerfile.j21
-rw-r--r--docker/openstack-base/Dockerfile.j21
2 files changed, 1 insertions, 1 deletions
diff --git a/docker/horizon/Dockerfile.j2 b/docker/horizon/Dockerfile.j2
index 55a1d4e94..30b227781 100644
--- a/docker/horizon/Dockerfile.j2
+++ b/docker/horizon/Dockerfile.j2
@@ -6,7 +6,6 @@ MAINTAINER Kolla Project (https://launchpad.net/kolla)
RUN yum -y install \
openstack-dashboard \
- python-keystoneauth1 \
httpd \
mod_wsgi \
&& yum clean all \
diff --git a/docker/openstack-base/Dockerfile.j2 b/docker/openstack-base/Dockerfile.j2
index 0458098e0..4556681d7 100644
--- a/docker/openstack-base/Dockerfile.j2
+++ b/docker/openstack-base/Dockerfile.j2
@@ -33,6 +33,7 @@ RUN yum -y install \
python-zaqarclient \
python-openstackclient \
MySQL-python \
+ python-keystoneauth1 \
&& yum clean all
{% endif %}