Merge "Deprecate ineffective ignore_default_tenant parameter"
This commit is contained in:
commit
190b35d9c9
|
@ -65,10 +65,6 @@
|
||||||
# Service tenant;
|
# Service tenant;
|
||||||
# string; optional: default to 'services'
|
# string; optional: default to 'services'
|
||||||
#
|
#
|
||||||
# [*ignore_default_tenant*]
|
|
||||||
# Ignore setting the default tenant value when the user is created.
|
|
||||||
# string; optional: default to false
|
|
||||||
#
|
|
||||||
# [*roles*]
|
# [*roles*]
|
||||||
# List of roles;
|
# List of roles;
|
||||||
# string; optional: default to ['admin']
|
# string; optional: default to ['admin']
|
||||||
|
@ -107,6 +103,12 @@
|
||||||
# If keystone_project_domain is not specified, use $keystone_default_domain
|
# If keystone_project_domain is not specified, use $keystone_default_domain
|
||||||
# Defaults to undef
|
# Defaults to undef
|
||||||
#
|
#
|
||||||
|
# DEPRECATED PARAMETERS
|
||||||
|
#
|
||||||
|
# [*ignore_default_tenant*]
|
||||||
|
# Ignore setting the default tenant value when the user is created.
|
||||||
|
# string; optional: default to undef
|
||||||
|
#
|
||||||
define keystone::resource::service_identity(
|
define keystone::resource::service_identity(
|
||||||
$ensure = 'present',
|
$ensure = 'present',
|
||||||
$admin_url = false,
|
$admin_url = false,
|
||||||
|
@ -124,15 +126,20 @@ define keystone::resource::service_identity(
|
||||||
$service_name = undef,
|
$service_name = undef,
|
||||||
$service_description = "${name} service",
|
$service_description = "${name} service",
|
||||||
$tenant = 'services',
|
$tenant = 'services',
|
||||||
$ignore_default_tenant = false,
|
|
||||||
$roles = ['admin'],
|
$roles = ['admin'],
|
||||||
$user_domain = undef,
|
$user_domain = undef,
|
||||||
$project_domain = undef,
|
$project_domain = undef,
|
||||||
$default_domain = undef,
|
$default_domain = undef,
|
||||||
|
# DEPRECATED PARAMETERS
|
||||||
|
$ignore_default_tenant = undef,
|
||||||
) {
|
) {
|
||||||
|
|
||||||
include keystone::deps
|
include keystone::deps
|
||||||
|
|
||||||
|
if $ignore_default_tenant != undef {
|
||||||
|
warning('The ignore_default_tenant parameter was deprecated and has no effect')
|
||||||
|
}
|
||||||
|
|
||||||
validate_legacy(Enum['present', 'absent'], 'validate_re', $ensure,
|
validate_legacy(Enum['present', 'absent'], 'validate_re', $ensure,
|
||||||
[['^present$', '^absent$'], 'Valid values for ensure parameter are present or absent'])
|
[['^present$', '^absent$'], 'Valid values for ensure parameter are present or absent'])
|
||||||
|
|
||||||
|
|
|
@ -0,0 +1,6 @@
|
||||||
|
---
|
||||||
|
deprecations:
|
||||||
|
- |
|
||||||
|
The ``keystone::resource::service_identity::ignore_default_tenant``
|
||||||
|
parameter has been deprecated and will be removed in a future. Actually
|
||||||
|
this parameter has been ineffective for some releases.
|
Loading…
Reference in New Issue