Deprecate signing_dir option
The signing_dir is deprecated for removel because of PKI token format is no longer supported. Update warning message and release note. Change-Id: I42b35c3cadde3bb22463c82e83168addfd4da99f Closes-Bug: #1652700
This commit is contained in:
@@ -175,16 +175,18 @@
|
||||
# reduce performance. Only valid for PKI tokens. Integer value
|
||||
# Defaults to $::os_service_default.
|
||||
#
|
||||
# [*signing_dir*]
|
||||
# (Optional) Directory used to cache files related to PKI tokens.
|
||||
# Defaults to $::os_service_default.
|
||||
#
|
||||
# [*token_cache_time*]
|
||||
# (Optional) In order to prevent excessive effort spent validating tokens,
|
||||
# the middleware caches previously-seen tokens for a configurable duration
|
||||
# (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 heat::keystone::authtoken(
|
||||
$password = $::os_service_default,
|
||||
$username = 'heat',
|
||||
@@ -219,8 +221,9 @@ class heat::keystone::authtoken(
|
||||
$memcached_servers = $::os_service_default,
|
||||
$region_name = $::os_service_default,
|
||||
$revocation_cache_time = $::os_service_default,
|
||||
$signing_dir = $::os_service_default,
|
||||
$token_cache_time = $::os_service_default,
|
||||
# DEPRECATED PARAMETERS
|
||||
$signing_dir = undef,
|
||||
) {
|
||||
|
||||
include ::heat::deps
|
||||
@@ -229,6 +232,10 @@ class heat::keystone::authtoken(
|
||||
fail('Please set password for heat 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 { 'heat_config':
|
||||
username => $username,
|
||||
password => $password,
|
||||
@@ -263,7 +270,6 @@ class heat::keystone::authtoken(
|
||||
memcached_servers => $memcached_servers,
|
||||
region_name => $region_name,
|
||||
revocation_cache_time => $revocation_cache_time,
|
||||
signing_dir => $signing_dir,
|
||||
token_cache_time => $token_cache_time,
|
||||
}
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user