openstack/puppet-openstack-integration
Code Issues Proposed changes

Remove workaround for old keystone package in UCA

Browse Source 
Now the keystone package in UCA provides the credential feature so
we can enable credential setup for both CentOS and Ubuntu.

Depends-on: https://review.opendev.org/821567
Change-Id: I1f54c87b8bb7a1c61cc18cfa8096670bc860bc7c
This commit is contained in:
Takashi Kajinami 2021-12-13 22:59:19 +09:00
parent f2d36488cd
commit 9bb96e4f31
1 changed files with 0 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
manifests/keystone.pp
View File

@ -38,14 +38,6 @@ class openstack_integration::keystone (
Exec['update-ca-certificates'] ~> Service['httpd'] Exec['update-ca-certificates'] ~> Service['httpd']
} }
# Keystone credential setup is not packaged in UCA yet.
# It should be done when Newton is released.
if $::osfamily == 'RedHat' {
$enable_credential_setup = true
} else {
$enable_credential_setup = false
}
class { 'keystone::client': } class { 'keystone::client': }
class { 'keystone::cron::fernet_rotate': class { 'keystone::cron::fernet_rotate':
hour => '*', hour => '*',
@ -70,7 +62,6 @@ class openstack_integration::keystone (
enable_ssl => $::openstack_integration::config::ssl, enable_ssl => $::openstack_integration::config::ssl,
public_endpoint => $::openstack_integration::config::keystone_auth_uri, public_endpoint => $::openstack_integration::config::keystone_auth_uri,
manage_policyrcd => true, manage_policyrcd => true,
enable_credential_setup => $enable_credential_setup,
fernet_key_repository => '/etc/keystone/fernet-keys/', fernet_key_repository => '/etc/keystone/fernet-keys/',
fernet_max_active_keys => '5', fernet_max_active_keys => '5',
token_expiration => $token_expiration, token_expiration => $token_expiration,