Remove keystone_v2 parameter

... because it was officially deprecated during Yoga release[1].

Identity v2 API was removed several cycles ago and the parameter has
been of no use since then.

[1] ba29e31a7a

Change-Id: I7d0f9c441f5d90a4387cd987e7ea064eb7cf4d7e
This commit is contained in:
Takashi Kajinami
2022-05-19 22:52:27 +09:00
parent e0260afbd9
commit e55129bd29
3 changed files with 4 additions and 9 deletions

View File

@@ -237,8 +237,6 @@
# Defaults to $::os_service_default
#
# DEPREACTED PARAMETERS
# [*keystone_v2*]
# Defaults to undef
# [*change_password_available*]
# Defaults to undef
# [*glance_v1*]
@@ -393,7 +391,6 @@ class tempest(
$load_balancer_global_observer_role = $::os_service_default,
$load_balancer_test_with_noop = $::os_service_default,
# DEPRECATED PARAMETERS
$keystone_v2 = undef,
$change_password_available = undef,
$glance_v1 = undef,
$glance_v2 = undef,
@@ -406,10 +403,6 @@ class tempest(
$tempest_roles_real = $::os_service_default
}
if $keystone_v2 != undef {
warning('The keystone_v2 parameter has been deprecated and will be removed in a future release.')
}
if $change_password_available != undef {
warning('The change_password_available parameter has been deprecated and has no effect')
}
@@ -555,7 +548,6 @@ class tempest(
'identity/auth_version': value => $auth_version;
'identity/ca_certificates_file': value => $ca_certificates_file;
'identity/disable_ssl_certificate_validation': value => $disable_ssl_validation;
'identity-feature-enabled/api_v2': value => pick($keystone_v2, $::os_service_default);
'identity-feature-enabled/api_v3': value => $keystone_v3;
'image-feature-enabled/api_v1': value => pick($glance_v1, $::os_service_default);
'image-feature-enabled/api_v2': value => pick($glance_v2, $::os_service_default);

View File

@@ -0,0 +1,4 @@
---
upgrade:
- |
The ``tempest::keystone_v2`` parameter has been removed.

View File

@@ -234,7 +234,6 @@ describe 'tempest' do
is_expected.to contain_tempest_config('identity/username').with(:value => nil)
is_expected.to contain_tempest_config('identity/ca_certificates_file').with(:value => nil)
is_expected.to contain_tempest_config('identity/disable_ssl_certificate_validation').with(:value => nil)
is_expected.to contain_tempest_config('identity-feature-enabled/api_v2').with(:value => '<SERVICE DEFAULT>')
is_expected.to contain_tempest_config('identity-feature-enabled/api_v3').with(:value => true)
is_expected.to contain_tempest_config('image-feature-enabled/api_v1').with(:value => '<SERVICE DEFAULT>')
is_expected.to contain_tempest_config('image-feature-enabled/api_v2').with(:value => '<SERVICE DEFAULT>')