openstack/kolla
Code Issues Proposed changes

Merge "add support for keystone federation"

Browse Source
This commit is contained in:
Zuul
2018-06-15 07:35:37 +00:00
committed by Gerrit Code Review
parent b4ff157327 52902434cd
commit de476329fc
1 changed files with 8 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
docker/keystone/keystone-base/Dockerfile.j2
View File

@@ -11,6 +11,8 @@ LABEL maintainer="{{ maintainer }}" name="{{ image_name }}" build-date="{{ build
{% if base_distro in ['centos', 'oraclelinux', 'rhel'] %} {% if base_distro in ['centos', 'oraclelinux', 'rhel'] %}
{% set keystone_base_packages = [ {% set keystone_base_packages = [
'httpd', 'httpd',
'mod_auth_mellon',
'mod_auth_openidc',
'mod_ssl', 'mod_ssl',
'mod_wsgi', 'mod_wsgi',
'openstack-keystone', 'openstack-keystone',
@@ -29,6 +31,8 @@ RUN mkdir -p /var/www/cgi-bin/keystone \
{% set keystone_base_packages = [ {% set keystone_base_packages = [
'apache2', 'apache2',
'keystone', 'keystone',
'libapache2-mod-auth-mellon',
'libapache2-mod-auth-openidc',
'libapache2-mod-wsgi', 'libapache2-mod-wsgi',
'python-ldappool' 'python-ldappool'
] %} ] %}
@@ -45,6 +49,8 @@ RUN mkdir -p /var/www/cgi-bin/keystone \
{% if base_distro in ['centos', 'oraclelinux', 'rhel'] %} {% if base_distro in ['centos', 'oraclelinux', 'rhel'] %}
{% set keystone_base_packages = [ {% set keystone_base_packages = [
'httpd', 'httpd',
'mod_auth_mellon',
'mod_auth_openidc',
'mod_ssl', 'mod_ssl',
'mod_wsgi', 'mod_wsgi',
'python-ldappool' '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'] %} {% elif base_distro in ['debian', 'ubuntu'] %}
{% set keystone_base_packages = [ {% set keystone_base_packages = [
'apache2', 'apache2',
'libapache2-mod-auth-mellon',
'libapache2-mod-auth-openidc',
'libapache2-mod-wsgi', 'libapache2-mod-wsgi',
'python-ldappool' 'python-ldappool'
] %} ] %}