auth_file: Deprecate tenant_name parameter
... in favor of the project_name parameter which replaces it. Change-Id: Ia27302d695a69a5d23ccb03b54f88eff18ed3e3f
This commit is contained in:
parent
27859a65f3
commit
442b40fd58
@ -28,10 +28,6 @@
|
|||||||
# (Optional) Username for this account as defined in keystone
|
# (Optional) Username for this account as defined in keystone
|
||||||
# Defaults to 'admin'.
|
# Defaults to 'admin'.
|
||||||
#
|
#
|
||||||
# [*tenant_name*]
|
|
||||||
# (Optional) Tenant for this account as defined in keystone
|
|
||||||
# Defaults to undef.
|
|
||||||
#
|
|
||||||
# [*project_name*]
|
# [*project_name*]
|
||||||
# (Optional) Project for this account as defined in keystone
|
# (Optional) Project for this account as defined in keystone
|
||||||
# Use instead of tenant_name for when using identity v3.
|
# Use instead of tenant_name for when using identity v3.
|
||||||
@ -127,13 +123,16 @@
|
|||||||
# (Optional) User domain in v3 api.
|
# (Optional) User domain in v3 api.
|
||||||
# Defaults to 'Default'.
|
# Defaults to 'Default'.
|
||||||
#
|
#
|
||||||
|
# [*tenant_name*]
|
||||||
|
# (Optional) Tenant for this account as defined in keystone
|
||||||
|
# Defaults to undef.
|
||||||
|
#
|
||||||
class openstack_extras::auth_file (
|
class openstack_extras::auth_file (
|
||||||
$password,
|
$password,
|
||||||
$auth_url = 'http://127.0.0.1:5000/v3/',
|
$auth_url = 'http://127.0.0.1:5000/v3/',
|
||||||
$service_token = undef,
|
$service_token = undef,
|
||||||
$service_endpoint = 'http://127.0.0.1:5000/v3/',
|
$service_endpoint = 'http://127.0.0.1:5000/v3/',
|
||||||
$username = 'admin',
|
$username = 'admin',
|
||||||
$tenant_name = undef,
|
|
||||||
$project_name = 'openstack',
|
$project_name = 'openstack',
|
||||||
$region_name = 'RegionOne',
|
$region_name = 'RegionOne',
|
||||||
$use_no_cache = true,
|
$use_no_cache = true,
|
||||||
@ -158,6 +157,7 @@ class openstack_extras::auth_file (
|
|||||||
# DEPRECATED PARAMETERS
|
# DEPRECATED PARAMETERS
|
||||||
$project_domain = undef,
|
$project_domain = undef,
|
||||||
$user_domain = undef,
|
$user_domain = undef,
|
||||||
|
$tenant_name = undef,
|
||||||
) {
|
) {
|
||||||
|
|
||||||
if $project_domain != undef {
|
if $project_domain != undef {
|
||||||
@ -176,6 +176,11 @@ Use user_domain_name instead')
|
|||||||
$user_domain_name_real = $user_domain_name
|
$user_domain_name_real = $user_domain_name
|
||||||
}
|
}
|
||||||
|
|
||||||
|
if $tenant_name != undef {
|
||||||
|
warning('tenant_name is deprecated and will be removed in a future release. \
|
||||||
|
Use project_name instead')
|
||||||
|
}
|
||||||
|
|
||||||
file { $path:
|
file { $path:
|
||||||
owner => 'root',
|
owner => 'root',
|
||||||
group => 'root',
|
group => 'root',
|
||||||
|
@ -0,0 +1,5 @@
|
|||||||
|
---
|
||||||
|
deprecations:
|
||||||
|
- |
|
||||||
|
The ``openstack_extras::auth_file::tenant_name`` parameter has been
|
||||||
|
deprecated. Use the ``project_name`` parameter instead.
|
Loading…
x
Reference in New Issue
Block a user