Remove deprecated package_ensure parameters
These were deprecated during the previous cycle and have had no effect
since then[1].
[1] fe95db4cb0
Change-Id: I75e5d92a6eebb74f0e0c728ff3298d169725b84c
This commit is contained in:
@@ -31,21 +31,12 @@
|
|||||||
# (optional) Whether or not to enable Web Single Sign-On (SSO)
|
# (optional) Whether or not to enable Web Single Sign-On (SSO)
|
||||||
# Defaults to false
|
# Defaults to false
|
||||||
#
|
#
|
||||||
# DEPRECATED PARAMETERS
|
|
||||||
#
|
|
||||||
# [*package_ensure*]
|
|
||||||
# (optional) Desired ensure state of packages.
|
|
||||||
# accepts latest or specific versions.
|
|
||||||
# Defaults to present.
|
|
||||||
#
|
|
||||||
class keystone::federation::mellon (
|
class keystone::federation::mellon (
|
||||||
$methods,
|
$methods,
|
||||||
$idp_name,
|
$idp_name,
|
||||||
$protocol_name,
|
$protocol_name,
|
||||||
$template_order = 331,
|
$template_order = 331,
|
||||||
$enable_websso = false,
|
$enable_websso = false,
|
||||||
# DEPRECATED PARAMETERS
|
|
||||||
$package_ensure = undef,
|
|
||||||
) {
|
) {
|
||||||
|
|
||||||
include apache
|
include apache
|
||||||
@@ -53,10 +44,6 @@ class keystone::federation::mellon (
|
|||||||
include keystone::deps
|
include keystone::deps
|
||||||
include keystone::params
|
include keystone::params
|
||||||
|
|
||||||
if $package_ensure != undef {
|
|
||||||
warning('The package_ensure parameter is deprecated and has no effect.')
|
|
||||||
}
|
|
||||||
|
|
||||||
# Note: if puppet-apache modify these values, this needs to be updated
|
# Note: if puppet-apache modify these values, this needs to be updated
|
||||||
if $template_order <= 330 or $template_order >= 999 {
|
if $template_order <= 330 or $template_order >= 999 {
|
||||||
fail('The template order should be greater than 330 and less than 999.')
|
fail('The template order should be greater than 330 and less than 999.')
|
||||||
|
@@ -128,13 +128,6 @@
|
|||||||
# The value 999 corresponds to the order for concat::fragment "${name}-file_footer".
|
# The value 999 corresponds to the order for concat::fragment "${name}-file_footer".
|
||||||
# (Optional) Defaults to 331.
|
# (Optional) Defaults to 331.
|
||||||
#
|
#
|
||||||
# DEPRECATED PARAMETERS
|
|
||||||
#
|
|
||||||
# [*package_ensure*]
|
|
||||||
# (Optional) Desired ensure state of packages.
|
|
||||||
# accepts latest or specific versions.
|
|
||||||
# Defaults to undef,
|
|
||||||
#
|
|
||||||
class keystone::federation::openidc (
|
class keystone::federation::openidc (
|
||||||
$keystone_url,
|
$keystone_url,
|
||||||
$methods,
|
$methods,
|
||||||
@@ -162,8 +155,6 @@ class keystone::federation::openidc (
|
|||||||
$redis_password = undef,
|
$redis_password = undef,
|
||||||
$remote_id_attribute = undef,
|
$remote_id_attribute = undef,
|
||||||
$template_order = 331,
|
$template_order = 331,
|
||||||
# DEPRECATED PARAMETERS
|
|
||||||
$package_ensure = undef,
|
|
||||||
) {
|
) {
|
||||||
|
|
||||||
include apache
|
include apache
|
||||||
@@ -174,10 +165,6 @@ class keystone::federation::openidc (
|
|||||||
|
|
||||||
validate_legacy(Boolean, 'validate_bool', $openidc_enable_oauth)
|
validate_legacy(Boolean, 'validate_bool', $openidc_enable_oauth)
|
||||||
|
|
||||||
if $package_ensure != undef {
|
|
||||||
warning('The package_ensure parameter is deprecated and has no effect.')
|
|
||||||
}
|
|
||||||
|
|
||||||
if !($openidc_verify_method in ['introspection', 'jwks']) {
|
if !($openidc_verify_method in ['introspection', 'jwks']) {
|
||||||
fail('Unsupported token verification method.' +
|
fail('Unsupported token verification method.' +
|
||||||
' Must be one of "introspection" or "jwks"')
|
' Must be one of "introspection" or "jwks"')
|
||||||
|
@@ -0,0 +1,8 @@
|
|||||||
|
---
|
||||||
|
upgrade:
|
||||||
|
- |
|
||||||
|
The following parameters have been removed.
|
||||||
|
|
||||||
|
- ``keystone::federation::openidc::package_ensure``
|
||||||
|
- ``keystone::federation::mellon::package_ensure``
|
||||||
|
|
Reference in New Issue
Block a user