openstack/puppet-tempest
Code Issues Proposed changes

Set Keystone v2 API to disabled by default

Browse Source 
The Keystone project is removing v2 API code (see [1]). puppet-tempest
should reflect that by not enabling this API by default, and using
v3 as the default value for auth_version.

[1] - https://review.openstack.org/#/q/topic:bp/removed-as-of-queens

Change-Id: I558e91cddb0e191de4874174e7774c2ec29d26ae
This commit is contained in:
Javier Pena 2017-09-26 17:32:13 +02:00
parent 2dc09e6705
commit da6fe3964b
3 changed files with 12 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
manifests/init.pp
View File

@ -176,11 +176,11 @@
# [*barbican_available*] # [*barbican_available*]
# Defaults to false # Defaults to false
# [*keystone_v2*] # [*keystone_v2*]
# Defaults to true # Defaults to false
# [*keystone_v3*] # [*keystone_v3*]
# Defaults to true # Defaults to true
# [*auth_version*] # [*auth_version*]
# Defaults to 'v2' # Defaults to 'v3'
# [*img_dir*] # [*img_dir*]
# Defaults to '/var/lib/tempest' # Defaults to '/var/lib/tempest'
# [*img_file*] # [*img_file*]
@ -338,9 +338,9 @@ class tempest(
$congress_available = false, $congress_available = false,
$octavia_available = false, $octavia_available = false,
$barbican_available = false, $barbican_available = false,
$keystone_v2 = true, $keystone_v2 = false,
$keystone_v3 = true, $keystone_v3 = true,
$auth_version = 'v2', $auth_version = 'v3',
$run_service_broker_tests = false, $run_service_broker_tests = false,
$ca_certificates_file = undef, $ca_certificates_file = undef,
$disable_ssl_validation = undef, $disable_ssl_validation = undef,

6
releasenotes/notes/disable-keystone-v2-864c0aa1959deba1.yaml Normal file
View File

@ -0,0 +1,6 @@
---
deprecations:
- |
The Keystone project is removing the API v2 code in the Queens cycle. To
adapt to this, the keystone_v2 and auth_version default values have been
changed to false and v3, respectively.

4
spec/classes/tempest_init_spec.rb
View File

@ -218,7 +218,7 @@ describe 'tempest' do
is_expected.to contain_tempest_config('validation/image_ssh_user').with(:value => nil) is_expected.to contain_tempest_config('validation/image_ssh_user').with(:value => nil)
is_expected.to contain_tempest_config('validation/run_validation').with(:value => false) is_expected.to contain_tempest_config('validation/run_validation').with(:value => false)
is_expected.to contain_tempest_config('identity/admin_role').with(:value => nil) is_expected.to contain_tempest_config('identity/admin_role').with(:value => nil)
is_expected.to contain_tempest_config('identity/auth_version').with(:value => 'v2') is_expected.to contain_tempest_config('identity/auth_version').with(:value => 'v3')
is_expected.to contain_tempest_config('identity/alt_password').with(:value => nil) is_expected.to contain_tempest_config('identity/alt_password').with(:value => nil)
is_expected.to contain_tempest_config('identity/alt_password').with_secret( true ) is_expected.to contain_tempest_config('identity/alt_password').with_secret( true )
is_expected.to contain_tempest_config('identity/alt_project_name').with(:value => nil) is_expected.to contain_tempest_config('identity/alt_project_name').with(:value => nil)
@ -231,7 +231,7 @@ describe 'tempest' do
is_expected.to contain_tempest_config('identity/username').with(:value => nil) 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/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_v2').with(:value => true) is_expected.to contain_tempest_config('identity-feature-enabled/api_v2').with(:value => false)
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 => 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) is_expected.to contain_tempest_config('image-feature-enabled/api_v2').with(:value => true)