openstack/puppet-tempest
Code Issues Proposed changes

Merge "Remove support for Glance v1 API parameter"

Browse Source
This commit is contained in:
Zuul
2023-08-29 15:45:41 +00:00
committed by Gerrit Code Review
parent 50ec2b6a1a f83606e31a
commit f450ccec78
3 changed files with 4 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
manifests/init.pp
View File

@@ -304,8 +304,6 @@
# Defaults to $facts['os_service_default'] # Defaults to $facts['os_service_default']
# #
# DEPREACTED PARAMETERS # DEPREACTED PARAMETERS
# [*glance_v1*]
# Defaults to false
# [*glance_v2*] # [*glance_v2*]
# Defaults to true # Defaults to true
# #
@@ -490,14 +488,9 @@ class tempest(
$share_multi_backend = $facts['os_service_default'], $share_multi_backend = $facts['os_service_default'],
$share_capability_storage_protocol = $facts['os_service_default'], $share_capability_storage_protocol = $facts['os_service_default'],
# DEPRECATED PARAMETERS # DEPRECATED PARAMETERS
$glance_v1 = undef,
$glance_v2 = undef, $glance_v2 = undef,
) { ) {
if $glance_v1 != undef {
warning('The glance_v1 parameter has been deprecated and will be removed in a future release.')
}
if $glance_v2 != undef { if $glance_v2 != undef {
warning('The glance_v2 parameter has been deprecated and will be removed in a future release.') warning('The glance_v2 parameter has been deprecated and will be removed in a future release.')
} }
@@ -646,7 +639,6 @@ class tempest(
'identity/ca_certificates_file': value => $ca_certificates_file; 'identity/ca_certificates_file': value => $ca_certificates_file;
'identity/disable_ssl_certificate_validation': value => $disable_ssl_validation; 'identity/disable_ssl_certificate_validation': value => $disable_ssl_validation;
'identity-feature-enabled/api_v3': value => $keystone_v3; 'identity-feature-enabled/api_v3': value => $keystone_v3;
'image-feature-enabled/api_v1': value => pick($glance_v1, $facts['os_service_default']);
'image-feature-enabled/api_v2': value => pick($glance_v2, $facts['os_service_default']); 'image-feature-enabled/api_v2': value => pick($glance_v2, $facts['os_service_default']);
'l2gw/l2gw_switch': value => $l2gw_switch; 'l2gw/l2gw_switch': value => $l2gw_switch;
'network-feature-enabled/api_extensions': value => join(any2array($neutron_api_extensions), ','); 'network-feature-enabled/api_extensions': value => join(any2array($neutron_api_extensions), ',');

4
releasenotes/notes/remove-glance-api-v1-e7d83fb2bbb6a0f6.yaml Normal file
View File

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

1
spec/classes/tempest_init_spec.rb
View File

@@ -289,7 +289,6 @@ describe 'tempest' do
is_expected.to contain_tempest_config('identity/ca_certificates_file').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/disable_ssl_certificate_validation').with(:value => nil)
is_expected.to contain_tempest_config('identity-feature-enabled/api_v3').with(:value => true) 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>') is_expected.to contain_tempest_config('image-feature-enabled/api_v2').with(:value => '<SERVICE DEFAULT>')
is_expected.to contain_tempest_config('l2gw/l2gw_switch').with(:value => nil) is_expected.to contain_tempest_config('l2gw/l2gw_switch').with(:value => nil)
is_expected.to contain_tempest_config('network-feature-enabled/api_extensions').with(:value => '<SERVICE DEFAULT>') is_expected.to contain_tempest_config('network-feature-enabled/api_extensions').with(:value => '<SERVICE DEFAULT>')