Remove deprecated keystone authtoken signing_dir option

Change-Id: I6e6cca651a8b157491cb1c2bde063c56e7c72dcd
changes/62/481362/2
ZhongShengping 5 years ago
parent 6e79149c34
commit 0adfc3d495
  1. 12
      manifests/api/authtoken.pp
  2. 12
      manifests/glare/authtoken.pp
  3. 12
      manifests/registry/authtoken.pp
  4. 3
      releasenotes/notes/remove_deprecated_keystone_signing_dir_option-928d7e97d61de301.yaml

@ -185,12 +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 glance::api::authtoken(
$username = 'glance',
$password = $::os_service_default,
@ -227,8 +221,6 @@ class glance::api::authtoken(
$region_name = $::os_service_default,
$revocation_cache_time = $::os_service_default,
$token_cache_time = $::os_service_default,
# DEPRECATED PARAMETERS
$signing_dir = undef,
) {
include ::glance::deps
@ -237,10 +229,6 @@ class glance::api::authtoken(
fail('Please set password for Glance 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 { 'glance_api_config':
username => $username,
password => $password,

@ -185,12 +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 glance::glare::authtoken(
$username = 'glance',
$password = $::os_service_default,
@ -227,18 +221,12 @@ class glance::glare::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) and $::glance::glare::keystone_password == undef {
fail('Please set password for Glance 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 { 'glance_glare_config':
username => $username,
password => $password,

@ -185,12 +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 glance::registry::authtoken(
$username = 'glance',
$password = $::os_service_default,
@ -227,8 +221,6 @@ class glance::registry::authtoken(
$region_name = $::os_service_default,
$revocation_cache_time = $::os_service_default,
$token_cache_time = $::os_service_default,
# DEPRECATED PARAMETERS
$signing_dir = undef,
) {
include ::glance::deps
@ -237,10 +229,6 @@ class glance::registry::authtoken(
fail('Please set password for Glance 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 { 'glance_registry_config':
username => $username,
password => $password,

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