openstack/puppet-openstack-integration
Code Issues Proposed changes

Merge "keystone: run credential setup on xenial"

Browse Source
This commit is contained in:
Jenkins 2017-09-19 02:33:14 +00:00 committed by Gerrit Code Review
commit e3987d660d
1 changed files with 0 additions and 9 deletions

9
manifests/keystone.pp

@ -53,14 +53,6 @@ class openstack_integration::keystone (
$enable_fernet_setup = false $enable_fernet_setup = false
} }
# 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::token_flush': } class { '::keystone::cron::token_flush': }
class { '::keystone::db::mysql': class { '::keystone::db::mysql':
@ -81,7 +73,6 @@ class openstack_integration::keystone (
manage_policyrcd => true, manage_policyrcd => true,
token_provider => $token_provider, token_provider => $token_provider,
enable_fernet_setup => $enable_fernet_setup, enable_fernet_setup => $enable_fernet_setup,
enable_credential_setup => $enable_credential_setup,
fernet_max_active_keys => '4', fernet_max_active_keys => '4',
token_expiration => $token_expiration, token_expiration => $token_expiration,
default_transport_url => os_transport_url({ default_transport_url => os_transport_url({