Deprecate support for [identity-feature-enabled] api_v2
... because the parameter in tempest was already deprecated[1]. [1] 1fbad23824bbb5f43cddb796a3f950d448cf9cc5 Change-Id: Ibdd4ad0a3918332fbd2f3dac1cc5a4315c34e897
This commit is contained in:
parent
1d3596f6c2
commit
ba29e31a7a
@ -177,8 +177,6 @@
|
||||
# Defaults to false
|
||||
# [*barbican_available*]
|
||||
# Defaults to false
|
||||
# [*keystone_v2*]
|
||||
# Defaults to false
|
||||
# [*keystone_v3*]
|
||||
# Defaults to true
|
||||
# [*auth_version*]
|
||||
@ -221,6 +219,8 @@
|
||||
# Defaults to undef
|
||||
# [*panko_available*]
|
||||
# Defaults to undef
|
||||
# [*keystone_v2*]
|
||||
# Defaults to undef
|
||||
#
|
||||
class tempest(
|
||||
$package_ensure = 'present',
|
||||
@ -341,7 +341,6 @@ class tempest(
|
||||
$vitrage_available = false,
|
||||
$octavia_available = false,
|
||||
$barbican_available = false,
|
||||
$keystone_v2 = false,
|
||||
$keystone_v3 = true,
|
||||
$auth_version = 'v3',
|
||||
$run_service_broker_tests = false,
|
||||
@ -361,6 +360,7 @@ class tempest(
|
||||
# DEPRECATED PARAMETERS
|
||||
$img_dir = undef,
|
||||
$panko_available = undef,
|
||||
$keystone_v2 = undef,
|
||||
) {
|
||||
|
||||
if !is_service_default($tempest_roles) and !empty($tempest_roles){
|
||||
@ -389,6 +389,10 @@ class tempest(
|
||||
warning('The panko_available parameter has been deprecated and has no effect')
|
||||
}
|
||||
|
||||
if $keystone_v2 != undef {
|
||||
warning('The keystone_v2 parameter has been deprecated and will be removed in a future release.')
|
||||
}
|
||||
|
||||
include tempest::params
|
||||
|
||||
include openstacklib::openstackclient
|
||||
@ -518,7 +522,7 @@ 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 => $keystone_v2;
|
||||
'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 => $glance_v1;
|
||||
'image-feature-enabled/api_v2': value => $glance_v2;
|
||||
|
5
releasenotes/notes/keystone_v2-a8ef9268447a6341.yaml
Normal file
5
releasenotes/notes/keystone_v2-a8ef9268447a6341.yaml
Normal file
@ -0,0 +1,5 @@
|
||||
---
|
||||
deprecations:
|
||||
- |
|
||||
The ``tempest::keystone_v2`` parameter has been deprecated, and will be
|
||||
removed in a future release.
|
@ -233,7 +233,7 @@ 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 => false)
|
||||
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 => true)
|
||||
is_expected.to contain_tempest_config('image-feature-enabled/api_v2').with(:value => true)
|
||||
|
Loading…
Reference in New Issue
Block a user