openstack
/
openstack-ansible-os_keystone
Code Issues Proposed changes

Improvements to federation packaging 

While shibboleth and mod_auth_openidc can theoretically co installed
now, unfortunately the shibboleth enabled configuation will cause
issues when using mod_auth_openidc.
As we only drop the configuration for one of these apache mods at a time
I have decided that it is best we only support one of these packages
being present at any time to avoid conflicts.

Change-Id: Ib0ebf1711db42dd00b3e14c1e5604fed2632437d
This commit is contained in:
Georgina 2021-06-30 14:49:03 +00:00 committed by Jonathan Rosser
parent 109d5b83b4
commit a57255b9fc
6 changed files with 17 additions and 120 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
tasks/keystone_install.yml
View File

@ -104,6 +104,12 @@
- Manage LB
- Restart web server
- name: Install/remove apache mod packages for federated authentication
package:
name: "{{ item.name }}"
state: "{{ item.state }}"
with_items: "{{ keystone_sp_apache_mod_packages }}"
- name: Install the python venv
import_role:
name: "python_venv_build"

11
vars/debian.yml
View File

@ -55,10 +55,11 @@ keystone_idp_distro_packages:
- ssl-cert
- xmlsec1
keystone_sp_distro_packages:
- "{{ keystone_sp_apache_mod_shib | ternary('libcurl3', 'libcurl4') }}"
- "{{ keystone_sp_apache_mod_auth_openidc | ternary('libapache2-mod-auth-openidc',
'libapache2-mod-shib2') }}"
keystone_sp_apache_mod_packages:
- name: libapache2-mod-shib
state: "{{ keystone_sp_apache_mod_shib | ternary('present', 'absent') }}"
- name: libapache2-mod-auth-openidc
state: "{{ keystone_sp_apache_mod_auth_openidc | ternary('present', 'absent') }}"
keystone_developer_mode_distro_packages:
- build-essential
@ -86,7 +87,7 @@ keystone_apache_configs:
keystone_apache_modules:
- name: "ssl"
state: "{{ (keystone_ssl | bool) | ternary('present', 'absent') }}"
- name: "shib2"
- name: "shib"
state: "{{ keystone_sp_apache_mod_shib | ternary('present', 'absent') }}"
- name: "auth_openidc"
state: "{{ keystone_sp_apache_mod_auth_openidc | ternary('present', 'absent') }}"

3
vars/distro_install.yml
View File

@ -25,9 +25,6 @@ keystone_package_list: |-
{% if keystone_idp != {} %}
{% set _ = packages.extend(keystone_idp_distro_packages) %}
{% endif %}
{% if keystone_sp != {} %}
{% set _ = packages.extend(keystone_sp_distro_packages) %}
{% endif %}
{% else %}
{% set _ = packages.extend(keystone_nginx_distro_packages) %}
{% endif %}

8
vars/redhat.yml
View File

@ -49,9 +49,11 @@ keystone_nginx_distro_packages:
keystone_idp_distro_packages:
- xmlsec1
keystone_sp_distro_packages:
- "{{ keystone_sp_apache_mod_auth_openidc | ternary('mod_auth_openidc',
'shibboleth') }}"
keystone_sp_apache_mod_packages:
- name: shibboleth
state: "{{ keystone_sp_apache_mod_shib | ternary('present', 'absent') }}"
- name: mod-auth-openidc
state: "{{ keystone_sp_apache_mod_auth_openidc | ternary('present', 'absent') }}"
keystone_developer_mode_distro_packages:
- gcc

3
vars/source_install.yml
View File

@ -25,9 +25,6 @@ keystone_package_list: |-
{% if keystone_idp != {} %}
{% set _ = packages.extend(keystone_idp_distro_packages) %}
{% endif %}
{% if keystone_sp != {} %}
{% set _ = packages.extend(keystone_sp_distro_packages) %}
{% endif %}
{% else %}
{% set _ = packages.extend(keystone_nginx_distro_packages) %}
{% endif %}

106
vars/ubuntu-20.04.yml
View File

@ -1,106 +0,0 @@
---
# Copyright 2016, Rackspace US, Inc.
#
# Licensed under the Apache License, Version 2.0 (the "License");
# you may not use this file except in compliance with the License.
# You may obtain a copy of the License at
#
# http://www.apache.org/licenses/LICENSE-2.0
#
# Unless required by applicable law or agreed to in writing, software
# distributed under the License is distributed on an "AS IS" BASIS,
# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
# See the License for the specific language governing permissions and
# limitations under the License.
cache_timeout: 600
keystone_distro_packages:
- git
- openssh-server
- rsync
- cron
- libpython3-dev
keystone_devel_distro_packages:
- docutils-common
- libffi-dev
- libjs-sphinxdoc
- libjs-underscore
- libldap2-dev
- libsasl2-dev
- libsystemd-dev
- libssl-dev
- libxslt1.1
- libxslt1-dev
- libxml2-dev
- pkg-config
- python3-dev
keystone_service_distro_packages:
- python3-keystone
- python3-systemd
- uwsgi
- uwsgi-plugin-python3
keystone_apache_distro_packages:
- apache2
- apache2-utils
- libapache2-mod-proxy-uwsgi
keystone_nginx_distro_packages:
- nginx-extras
keystone_idp_distro_packages:
- ssl-cert
- xmlsec1
keystone_sp_distro_packages:
- libapache2-mod-auth-openidc
- libapache2-mod-shib
keystone_developer_mode_distro_packages:
- build-essential
keystone_oslomsg_amqp1_distro_packages:
- libsasl2-modules
- sasl2-bin
keystone_apache_default_sites:
- "/etc/apache2/sites-enabled/000-default.conf"
keystone_apache_site_available: "/etc/apache2/sites-available/keystone-httpd.conf"
keystone_apache_site_enabled: "/etc/apache2/sites-enabled/keystone-httpd.conf"
keystone_apache_conf: "/etc/apache2/apache2.conf"
keystone_apache_default_log_folder: "/var/log/apache2"
keystone_apache_default_log_owner: "root"
keystone_apache_default_log_grp: "adm"
keystone_apache_security_conf: "/etc/apache2/conf-available/security.conf"
keystone_apache_configs:
- { src: "keystone-ports.conf.j2", dest: "/etc/apache2/ports.conf" }
- { src: "keystone-httpd.conf.j2", dest: "/etc/apache2/sites-available/keystone-httpd.conf" }
- { src: "keystone-httpd-mpm.conf.j2", dest: "/etc/apache2/mods-available/mpm_{{ keystone_httpd_mpm_backend }}.conf" }
keystone_apache_modules:
- name: "ssl"
state: "{{ (keystone_ssl | bool) | ternary('present', 'absent') }}"
- name: "shib"
state: "{{ keystone_sp_apache_mod_shib | ternary('present', 'absent') }}"
- name: "auth_openidc"
state: "{{ keystone_sp_apache_mod_auth_openidc | ternary('present', 'absent') }}"
- name: "proxy_uwsgi"
state: "present"
- name: "headers"
state: "present"
# This can be enabled when Apache2.5+ is available
# - name: "mod_journald"
# state: "present
keystone_nginx_conf_path: "sites-available"
keystone_system_service_name: apache2
keystone_uwsgi_bin: '/usr/bin'
keystone_sshd: ssh