diff --git a/config/puppet-modules/openstack/puppet-keystone-11.3.0/centos/build_srpm.data b/config/puppet-modules/openstack/puppet-keystone-11.3.0/centos/build_srpm.data index c66bf348c..898fe26d9 100644 --- a/config/puppet-modules/openstack/puppet-keystone-11.3.0/centos/build_srpm.data +++ b/config/puppet-modules/openstack/puppet-keystone-11.3.0/centos/build_srpm.data @@ -1 +1 @@ -TIS_PATCH_VER=7 +TIS_PATCH_VER=8 diff --git a/config/puppet-modules/openstack/puppet-keystone-11.3.0/centos/meta_patches/0006-Add-support-for-fernet-receipts.patch b/config/puppet-modules/openstack/puppet-keystone-11.3.0/centos/meta_patches/0006-Add-support-for-fernet-receipts.patch new file mode 100644 index 000000000..0bea966bb --- /dev/null +++ b/config/puppet-modules/openstack/puppet-keystone-11.3.0/centos/meta_patches/0006-Add-support-for-fernet-receipts.patch @@ -0,0 +1,32 @@ +From 1950a583743a3e5e8a1b3c83a55c2b8a307b7f14 Mon Sep 17 00:00:00 2001 +From: Tyler Smith +Date: Wed, 10 Apr 2019 15:41:03 -0400 +Subject: [PATCH 1/1] Add support for fernet receipts + +--- + SPECS/puppet-keystone.spec | 2 ++ + 1 file changed, 2 insertions(+) + +diff --git a/SPECS/puppet-keystone.spec b/SPECS/puppet-keystone.spec +index 301002a..5b5e255 100644 +--- a/SPECS/puppet-keystone.spec ++++ b/SPECS/puppet-keystone.spec +@@ -14,6 +14,7 @@ Patch0001: 0001-pike-rebase-squash-titanium-patches.patch + Patch0002: 0002-remove-the-Keystone-admin-app.patch + Patch0003: 0003-remove-eventlet_bindhost-from-Keystoneconf.patch + Patch0004: 0004-escape-special-characters-in-bootstrap.patch ++Patch0005: 0005-Add-support-for-fernet-receipts.patch + + BuildArch: noarch + +@@ -35,6 +36,7 @@ Puppet module for OpenStack Keystone + %patch0002 -p1 + %patch0003 -p1 + %patch0004 -p1 ++%patch0005 -p1 + + find . -type f -name ".*" -exec rm {} + + find . -size 0 -exec rm {} + +-- +1.8.3.1 + diff --git a/config/puppet-modules/openstack/puppet-keystone-11.3.0/centos/meta_patches/PATCH_ORDER b/config/puppet-modules/openstack/puppet-keystone-11.3.0/centos/meta_patches/PATCH_ORDER index 10c69992f..be22cf58c 100644 --- a/config/puppet-modules/openstack/puppet-keystone-11.3.0/centos/meta_patches/PATCH_ORDER +++ b/config/puppet-modules/openstack/puppet-keystone-11.3.0/centos/meta_patches/PATCH_ORDER @@ -3,3 +3,4 @@ 0003-remove-the-keystone-admin-app.patch 0004-remove-eventlet_and_bindhost-from-keystoneconf.patch 0005-escape-special-characters-in-bootstrap.patch +0006-Add-support-for-fernet-receipts.patch diff --git a/config/puppet-modules/openstack/puppet-keystone-11.3.0/centos/patches/0005-Add-support-for-fernet-receipts.patch b/config/puppet-modules/openstack/puppet-keystone-11.3.0/centos/patches/0005-Add-support-for-fernet-receipts.patch new file mode 100644 index 000000000..5ba045d6c --- /dev/null +++ b/config/puppet-modules/openstack/puppet-keystone-11.3.0/centos/patches/0005-Add-support-for-fernet-receipts.patch @@ -0,0 +1,43 @@ +From 65de0c6615e2e94a4fd234fc1826e3eb403bb575 Mon Sep 17 00:00:00 2001 +From: Tyler Smith +Date: Wed, 10 Apr 2019 15:37:25 -0400 +Subject: [PATCH 1/1] Add support for fernet receipts + +--- + manifests/init.pp | 15 +++++++++------ + 1 file changed, 9 insertions(+), 6 deletions(-) + +diff --git a/manifests/init.pp b/manifests/init.pp +index 89af303..a6d5cc3 100644 +--- a/manifests/init.pp ++++ b/manifests/init.pp +@@ -1247,18 +1247,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. +-- +1.8.3.1 +