auth_file: Remove deprecated tenant_name
This parameter was deprecated some releases ago[1] in favor of the project_name parameter. [1] 442b40fd58f9aeb0d1f6e7029ce6419393e72e1c Change-Id: Ie38bd26350f8d2a14cebcb047e449a582c5a1a3e
This commit is contained in:
parent
cc53b1c307
commit
808e963f6d
manifests
releasenotes/notes
spec/classes
templates
@ -113,12 +113,6 @@
|
|||||||
# (Optional) Object API version to use.
|
# (Optional) Object API version to use.
|
||||||
# Defaults to undef.
|
# Defaults to undef.
|
||||||
#
|
#
|
||||||
# DEPRECATED PARAMETERS
|
|
||||||
#
|
|
||||||
# [*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/',
|
||||||
@ -146,15 +140,8 @@ class openstack_extras::auth_file (
|
|||||||
$volume_api_version = undef,
|
$volume_api_version = undef,
|
||||||
$identity_api_version = '3',
|
$identity_api_version = '3',
|
||||||
$object_api_version = undef,
|
$object_api_version = undef,
|
||||||
# DEPRECATED PARAMETERS
|
|
||||||
$tenant_name = undef,
|
|
||||||
) {
|
) {
|
||||||
|
|
||||||
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 @@
|
|||||||
|
---
|
||||||
|
upgrade:
|
||||||
|
- |
|
||||||
|
The deprecated ``openstack_extras::auth_file::tenant_name`` parameter has
|
||||||
|
been removed.
|
@ -48,7 +48,6 @@ describe 'openstack_extras::auth_file' do
|
|||||||
:service_token => 'servicetoken',
|
:service_token => 'servicetoken',
|
||||||
:service_endpoint => 'http://127.0.0.2:5000/v3/',
|
:service_endpoint => 'http://127.0.0.2:5000/v3/',
|
||||||
:username => 'myuser',
|
:username => 'myuser',
|
||||||
:tenant_name => 'mytenant',
|
|
||||||
:project_name => 'myproject',
|
:project_name => 'myproject',
|
||||||
:region_name => 'myregion',
|
:region_name => 'myregion',
|
||||||
:use_no_cache => 'false',
|
:use_no_cache => 'false',
|
||||||
@ -85,7 +84,6 @@ describe 'openstack_extras::auth_file' do
|
|||||||
'export OS_SERVICE_TOKEN=\'servicetoken\'',
|
'export OS_SERVICE_TOKEN=\'servicetoken\'',
|
||||||
'export OS_SERVICE_ENDPOINT=\'http://127.0.0.2:5000/v3/\'',
|
'export OS_SERVICE_ENDPOINT=\'http://127.0.0.2:5000/v3/\'',
|
||||||
'export OS_NO_CACHE=\'false\'',
|
'export OS_NO_CACHE=\'false\'',
|
||||||
'export OS_TENANT_NAME=\'mytenant\'',
|
|
||||||
'export OS_PROJECT_NAME=\'myproject\'',
|
'export OS_PROJECT_NAME=\'myproject\'',
|
||||||
'export OS_USERNAME=\'myuser\'',
|
'export OS_USERNAME=\'myuser\'',
|
||||||
'export OS_PASSWORD=\'admin\'',
|
'export OS_PASSWORD=\'admin\'',
|
||||||
|
@ -4,9 +4,6 @@ export OS_SERVICE_TOKEN='<%= @service_token.gsub(/'/){ %q(\') } %>'
|
|||||||
export OS_SERVICE_ENDPOINT='<%= @service_endpoint %>'
|
export OS_SERVICE_ENDPOINT='<%= @service_endpoint %>'
|
||||||
<% end -%>
|
<% end -%>
|
||||||
export OS_NO_CACHE='<%= @use_no_cache %>'
|
export OS_NO_CACHE='<%= @use_no_cache %>'
|
||||||
<% if @tenant_name -%>
|
|
||||||
export OS_TENANT_NAME='<%= @tenant_name %>'
|
|
||||||
<% end -%>
|
|
||||||
<% if @project_name -%>
|
<% if @project_name -%>
|
||||||
export OS_PROJECT_NAME='<%= @project_name %>'
|
export OS_PROJECT_NAME='<%= @project_name %>'
|
||||||
<% end -%>
|
<% end -%>
|
||||||
|
Loading…
x
Reference in New Issue
Block a user