8a88130973
Aligned with Debian Bullseye version puppet-module-keystone-17.4.0-2. Did build puppet-keystone-17.4.0 + starlingx patches (adapted from CentOS7). Adapted all patches. Did build an iso. Big logic changes in upstream version, here are 3 examples:bc1ff1d7cb"58dfc07b3a"329ab549a2" Adapt patch 1. Keep patch 5. Drop patches 2, 3, 4, 7 as they are not not needed. Adpat patch 6, but integration work is needed to generate hieradata for keystone::bootstrap::dc_admin_user_id instead of keystone::dc_admin_user_id and keystone::bootstrap::dc_admin_project_id instead of keystone::dc_admin_project_id. Integration work is needed anyway to adapt existing components to use this version of puppet-module-keystone. Story: 2009101 Task: 43370 Signed-off-by: Dan Voiculeasa <dan.voiculeasa@windriver.com> Change-Id: I4ccaf74e774f353ba36cc7412fceb82adf650bb5
44 lines
1.6 KiB
Diff
44 lines
1.6 KiB
Diff
From 066421ff4de665e93923f10dc211ed465a60f30a Mon Sep 17 00:00:00 2001
|
|
From: Tyler Smith <tyler.smith@windriver.com>
|
|
Date: Wed, 10 Apr 2019 15:37:25 -0400
|
|
Subject: [PATCH 2/3] Add support for fernet receipts
|
|
|
|
---
|
|
manifests/init.pp | 13 ++++++++-----
|
|
1 file changed, 8 insertions(+), 5 deletions(-)
|
|
|
|
diff --git a/manifests/init.pp b/manifests/init.pp
|
|
index ee07bd3..0dc3fb2 100644
|
|
--- a/manifests/init.pp
|
|
+++ b/manifests/init.pp
|
|
@@ -758,18 +758,21 @@ running as a standalone service, or httpd for being run by a httpd server")
|
|
|
|
if $fernet_key_repository {
|
|
keystone_config {
|
|
- 'fernet_tokens/key_repository': value => $fernet_key_repository;
|
|
+ 'fernet_tokens/key_repository': value => $fernet_key_repository;
|
|
+ 'fernet_receipts/key_repository': value => $fernet_key_repository;
|
|
}
|
|
} else {
|
|
keystone_config {
|
|
- 'fernet_tokens/key_repository': ensure => absent;
|
|
+ 'fernet_tokens/key_repository': ensure => absent;
|
|
+ 'fernet_receipts/key_repository': ensure => absent;
|
|
}
|
|
}
|
|
|
|
keystone_config {
|
|
- 'token/revoke_by_id': value => $revoke_by_id;
|
|
- 'fernet_tokens/max_active_keys': value => $fernet_max_active_keys;
|
|
- 'credential/key_repository': value => $credential_key_repository;
|
|
+ 'token/revoke_by_id': value => $revoke_by_id;
|
|
+ 'fernet_tokens/max_active_keys': value => $fernet_max_active_keys;
|
|
+ 'fernet_receipts/max_active_keys': value => $fernet_max_active_keys;
|
|
+ 'credential/key_repository': value => $credential_key_repository;
|
|
}
|
|
|
|
# Update this code when https://bugs.launchpad.net/keystone/+bug/1472285 is addressed.
|
|
--
|
|
2.30.0
|
|
|