openstack/puppet-nova
Code Issues Proposed changes

Merge "Remove deprecated keystone authtoken signing_dir option"

Browse Source
This commit is contained in:
Jenkins
2017-07-06 16:50:39 +00:00
committed by Gerrit Code Review
parent 4431058899 e869005e6a
commit eb22fba20b
2 changed files with 3 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
manifests/keystone/authtoken.pp
View File

@@ -185,11 +185,6 @@
# (in seconds). Set to -1 to disable caching completely. Integer value # (in seconds). Set to -1 to disable caching completely. Integer value
# Defaults to $::os_service_default. # Defaults to $::os_service_default.
# #
# DEPRECATED PARAMETERS
#
# [*signing_dir*]
# (Optional) Directory used to cache files related to PKI tokens.
# Defaults to undef
# #
class nova::keystone::authtoken( class nova::keystone::authtoken(
$username = 'nova', $username = 'nova',
@@ -227,17 +222,12 @@ class nova::keystone::authtoken(
$region_name = $::os_service_default, $region_name = $::os_service_default,
$revocation_cache_time = $::os_service_default, $revocation_cache_time = $::os_service_default,
$token_cache_time = $::os_service_default, $token_cache_time = $::os_service_default,
# DEPRECATED PARAMETERS
$signing_dir = undef,
) { ) {
if is_service_default($password) { if is_service_default($password) {
fail('Please set password for nova service user') fail('Please set password for nova service user')
} }
if $signing_dir {
warning('signing_dir parameter is deprecated, has no effect and will be removed in the P release.')
}
keystone::resource::authtoken { 'nova_config': keystone::resource::authtoken { 'nova_config':
username => $username, username => $username,

3
releasenotes/notes/remove_deprecated_keystone_signing_dir_option-e545c1de128ea8a1.yaml Normal file
View File

@@ -0,0 +1,3 @@
---
upgrade:
- Deprecated keystone authtoken signing_dir option is removed in Pike.