diff --git a/manifests/resource/service_identity.pp b/manifests/resource/service_identity.pp index eaf15981b..ef09dab5f 100644 --- a/manifests/resource/service_identity.pp +++ b/manifests/resource/service_identity.pp @@ -65,10 +65,6 @@ # Service tenant; # 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*] # List of roles; # string; optional: default to ['admin'] @@ -107,6 +103,12 @@ # If keystone_project_domain is not specified, use $keystone_default_domain # 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( $ensure = 'present', $admin_url = false, @@ -124,15 +126,20 @@ define keystone::resource::service_identity( $service_name = undef, $service_description = "${name} service", $tenant = 'services', - $ignore_default_tenant = false, $roles = ['admin'], $user_domain = undef, $project_domain = undef, $default_domain = undef, + # DEPRECATED PARAMETERS + $ignore_default_tenant = undef, ) { 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, [['^present$', '^absent$'], 'Valid values for ensure parameter are present or absent']) diff --git a/releasenotes/notes/deprecate-ignore_default_tenant-80b0083f34ae00fa.yaml b/releasenotes/notes/deprecate-ignore_default_tenant-80b0083f34ae00fa.yaml new file mode 100644 index 000000000..6223f0c66 --- /dev/null +++ b/releasenotes/notes/deprecate-ignore_default_tenant-80b0083f34ae00fa.yaml @@ -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.