aboutsummaryrefslogtreecommitdiff
path: root/docker/keystone
diff options
context:
space:
mode:
authorZuul <zuul@review.openstack.org>2018-07-13 11:53:31 +0000
committerGerrit Code Review <review@openstack.org>2018-07-13 11:53:31 +0000
commit74612346b0a76978c2ff0dabef564ac64880e64b (patch)
treebf1555e32e50cdca45dd5c48f53ba9f96db9bcd2 /docker/keystone
parent3d273521817ef19191332cf80274174f4c978701 (diff)
parent5951977eab3865eace96857df52914f41bd90146 (diff)
downloadkolla-74612346b0a76978c2ff0dabef564ac64880e64b.tar.gz
kolla-74612346b0a76978c2ff0dabef564ac64880e64b.zip
Merge "Stop using deprecated rpm package names"
Diffstat (limited to 'docker/keystone')
-rw-r--r--docker/keystone/keystone-base/Dockerfile.j24
1 files changed, 2 insertions, 2 deletions
diff --git a/docker/keystone/keystone-base/Dockerfile.j2 b/docker/keystone/keystone-base/Dockerfile.j2
index 9d65a3cd7..1c0bad8fd 100644
--- a/docker/keystone/keystone-base/Dockerfile.j2
+++ b/docker/keystone/keystone-base/Dockerfile.j2
@@ -16,7 +16,7 @@ LABEL maintainer="{{ maintainer }}" name="{{ image_name }}" build-date="{{ build
'mod_ssl',
'mod_wsgi',
'openstack-keystone',
- 'python-ldappool',
+ 'python2-ldappool',
'python-keystoneclient'
] %}
@@ -53,7 +53,7 @@ RUN mkdir -p /var/www/cgi-bin/keystone \
'mod_auth_openidc',
'mod_ssl',
'mod_wsgi',
- 'python-ldappool'
+ 'python2-ldappool'
] %}
{{ macros.install_packages(keystone_base_packages | customizable("packages")) }}
RUN sed -i -r 's,^(Listen 80),#\1,' /etc/httpd/conf/httpd.conf \