Merge "Remove deprecated keystone authtoken signing_dir option"

This commit is contained in:
Jenkins 2017-07-06 16:50:39 +00:00 committed by Gerrit Code Review
commit eb22fba20b
2 changed files with 3 additions and 10 deletions

View File

@ -185,11 +185,6 @@
# (in seconds). Set to -1 to disable caching completely. Integer value
# 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(
$username = 'nova',
@ -227,17 +222,12 @@ class nova::keystone::authtoken(
$region_name = $::os_service_default,
$revocation_cache_time = $::os_service_default,
$token_cache_time = $::os_service_default,
# DEPRECATED PARAMETERS
$signing_dir = undef,
) {
if is_service_default($password) {
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':
username => $username,

View File

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