diff --git a/manifests/auth_file.pp b/manifests/auth_file.pp index deb0c21..dece9e2 100644 --- a/manifests/auth_file.pp +++ b/manifests/auth_file.pp @@ -113,12 +113,6 @@ # (Optional) Object API version to use. # Defaults to undef. # -# DEPRECATED PARAMETERS -# -# [*tenant_name*] -# (Optional) Tenant for this account as defined in keystone -# Defaults to undef. -# class openstack_extras::auth_file ( $password, $auth_url = 'http://127.0.0.1:5000/v3/', @@ -146,15 +140,8 @@ class openstack_extras::auth_file ( $volume_api_version = undef, $identity_api_version = '3', $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: owner => 'root', group => 'root', diff --git a/releasenotes/notes/remove-openrc-tenant_name-b3c39a6b1a758f05.yaml b/releasenotes/notes/remove-openrc-tenant_name-b3c39a6b1a758f05.yaml new file mode 100644 index 0000000..a6987cc --- /dev/null +++ b/releasenotes/notes/remove-openrc-tenant_name-b3c39a6b1a758f05.yaml @@ -0,0 +1,5 @@ +--- +upgrade: + - | + The deprecated ``openstack_extras::auth_file::tenant_name`` parameter has + been removed. diff --git a/spec/classes/openstack_extras_auth_file_spec.rb b/spec/classes/openstack_extras_auth_file_spec.rb index 3075a3b..0ca04c7 100644 --- a/spec/classes/openstack_extras_auth_file_spec.rb +++ b/spec/classes/openstack_extras_auth_file_spec.rb @@ -48,7 +48,6 @@ describe 'openstack_extras::auth_file' do :service_token => 'servicetoken', :service_endpoint => 'http://127.0.0.2:5000/v3/', :username => 'myuser', - :tenant_name => 'mytenant', :project_name => 'myproject', :region_name => 'myregion', :use_no_cache => 'false', @@ -85,7 +84,6 @@ describe 'openstack_extras::auth_file' do 'export OS_SERVICE_TOKEN=\'servicetoken\'', 'export OS_SERVICE_ENDPOINT=\'http://127.0.0.2:5000/v3/\'', 'export OS_NO_CACHE=\'false\'', - 'export OS_TENANT_NAME=\'mytenant\'', 'export OS_PROJECT_NAME=\'myproject\'', 'export OS_USERNAME=\'myuser\'', 'export OS_PASSWORD=\'admin\'', diff --git a/templates/openrc.erb b/templates/openrc.erb index 6131510..ca1dbe2 100644 --- a/templates/openrc.erb +++ b/templates/openrc.erb @@ -4,9 +4,6 @@ export OS_SERVICE_TOKEN='<%= @service_token.gsub(/'/){ %q(\') } %>' export OS_SERVICE_ENDPOINT='<%= @service_endpoint %>' <% end -%> export OS_NO_CACHE='<%= @use_no_cache %>' -<% if @tenant_name -%> -export OS_TENANT_NAME='<%= @tenant_name %>' -<% end -%> <% if @project_name -%> export OS_PROJECT_NAME='<%= @project_name %>' <% end -%>