Remove deprecated keystone authtoken signing_dir option
Change-Id: Ib5569de793dd9922c8f723eaadd96aaec8d34beb
This commit is contained in:
parent
30e069012d
commit
df37477dbd
|
@ -185,12 +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 ceilometer::keystone::authtoken(
|
class ceilometer::keystone::authtoken(
|
||||||
$username = 'ceilometer',
|
$username = 'ceilometer',
|
||||||
$password = $::os_service_default,
|
$password = $::os_service_default,
|
||||||
|
@ -227,8 +221,6 @@ class ceilometer::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,
|
|
||||||
) {
|
) {
|
||||||
|
|
||||||
include ::ceilometer::deps
|
include ::ceilometer::deps
|
||||||
|
@ -237,10 +229,6 @@ class ceilometer::keystone::authtoken(
|
||||||
fail('Please set password for ceilometer service user')
|
fail('Please set password for ceilometer 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 { 'ceilometer_config':
|
keystone::resource::authtoken { 'ceilometer_config':
|
||||||
username => $username,
|
username => $username,
|
||||||
password => $password,
|
password => $password,
|
||||||
|
|
|
@ -0,0 +1,3 @@
|
||||||
|
---
|
||||||
|
upgrade:
|
||||||
|
- Deprecated keystone authtoken signing_dir option is removed in Pike.
|
Loading…
Reference in New Issue