diff options
| author | Zuul <zuul@review.openstack.org> | 2018-06-15 07:35:37 +0000 |
|---|---|---|
| committer | Gerrit Code Review <review@openstack.org> | 2018-06-15 07:35:37 +0000 |
| commit | de476329fc8b30c89add12036b9f464f1b64534e (patch) | |
| tree | c6f1463444b2a10e1f0e735657c7b0fc1ee76a8e | |
| parent | b4ff157327e27ce18cc728e1c1e4a8b4872d8b31 (diff) | |
| parent | 52902434cdd2afea73eeb8101f1ca1953058432e (diff) | |
| download | kolla-de476329fc8b30c89add12036b9f464f1b64534e.tar.gz kolla-de476329fc8b30c89add12036b9f464f1b64534e.zip | |
Merge "add support for keystone federation"
| -rw-r--r-- | docker/keystone/keystone-base/Dockerfile.j2 | 8 |
1 files changed, 8 insertions, 0 deletions
diff --git a/docker/keystone/keystone-base/Dockerfile.j2 b/docker/keystone/keystone-base/Dockerfile.j2 index d22c01b76..9d65a3cd7 100644 --- a/docker/keystone/keystone-base/Dockerfile.j2 +++ b/docker/keystone/keystone-base/Dockerfile.j2 @@ -11,6 +11,8 @@ LABEL maintainer="{{ maintainer }}" name="{{ image_name }}" build-date="{{ build {% if base_distro in ['centos', 'oraclelinux', 'rhel'] %} {% set keystone_base_packages = [ 'httpd', + 'mod_auth_mellon', + 'mod_auth_openidc', 'mod_ssl', 'mod_wsgi', 'openstack-keystone', @@ -29,6 +31,8 @@ RUN mkdir -p /var/www/cgi-bin/keystone \ {% set keystone_base_packages = [ 'apache2', 'keystone', + 'libapache2-mod-auth-mellon', + 'libapache2-mod-auth-openidc', 'libapache2-mod-wsgi', 'python-ldappool' ] %} @@ -45,6 +49,8 @@ RUN mkdir -p /var/www/cgi-bin/keystone \ {% if base_distro in ['centos', 'oraclelinux', 'rhel'] %} {% set keystone_base_packages = [ 'httpd', + 'mod_auth_mellon', + 'mod_auth_openidc', 'mod_ssl', 'mod_wsgi', 'python-ldappool' @@ -56,6 +62,8 @@ RUN sed -i -r 's,^(Listen 80),#\1,' /etc/httpd/conf/httpd.conf \ {% elif base_distro in ['debian', 'ubuntu'] %} {% set keystone_base_packages = [ 'apache2', + 'libapache2-mod-auth-mellon', + 'libapache2-mod-auth-openidc', 'libapache2-mod-wsgi', 'python-ldappool' ] %} |