From 6b02001deac71c0d2aaee1e59ef7b687591db8fa Mon Sep 17 00:00:00 2001
From: Alex Barchiesi <alex.barchiesi@garr.it>
Date: Tue, 7 Nov 2017 15:53:46 +0100
Subject: [PATCH] Fix to parameters in wsgi-openstack-api.conf
---
hooks/keystone_context.py | 6 ++++--
hooks/keystone_utils.py | 1 +
2 files changed, 5 insertions(+), 2 deletions(-)
diff --git a/hooks/keystone_context.py b/hooks/keystone_context.py
index 9c5cb384..5645ab56 100644
--- a/hooks/keystone_context.py
+++ b/hooks/keystone_context.py
@@ -281,6 +281,10 @@ class KeystoneContext(context.OSContextGenerator):
resolve_address(ADMIN),
api_port('keystone-admin')).replace('v2.0', '')
+ ctxt['enable_oidc'] = config('enable-oidc')
+ ctxt['enable_saml2'] = config('enable-saml2')
+ ctxt['trusted_dashboard'] = config('trusted-dashboard')
+
return ctxt
@@ -291,7 +295,6 @@ class SamlContext(context.OSContextGenerator):
api_port, endpoint_url, resolve_address, PUBLIC,
)
ctxt = {}
- ctxt['trusted_dashboard'] = config('trusted-dashboard')
enable_saml2 = config('enable-saml2')
if enable_saml2:
@@ -434,7 +437,6 @@ class OidcContext(context.OSContextGenerator):
resolve_address(PUBLIC), api_port('keystone-public'),
'/v3/auth/OS-FEDERATION/websso/oidc/redirect'),
}
- ctxt['trusted_dashboard'] = config('trusted-dashboard')
return ctxt
diff --git a/hooks/keystone_utils.py b/hooks/keystone_utils.py
index 1ea356dc..18065918 100644
--- a/hooks/keystone_utils.py
+++ b/hooks/keystone_utils.py
@@ -476,6 +476,7 @@ def resource_map():
admin_script=admin_script,
public_script=public_script),
keystoneContext,
+ samlContext,
keystone_context.OidcContext()],
'services': ['apache2']
}
--
GitLab