diff --git a/manifests/init.pp b/manifests/init.pp index 3a6a576e..07335e1f 100644 --- a/manifests/init.pp +++ b/manifests/init.pp @@ -176,11 +176,11 @@ # [*barbican_available*] # Defaults to false # [*keystone_v2*] -# Defaults to true +# Defaults to false # [*keystone_v3*] # Defaults to true # [*auth_version*] -# Defaults to 'v2' +# Defaults to 'v3' # [*img_dir*] # Defaults to '/var/lib/tempest' # [*img_file*] @@ -338,9 +338,9 @@ class tempest( $congress_available = false, $octavia_available = false, $barbican_available = false, - $keystone_v2 = true, + $keystone_v2 = false, $keystone_v3 = true, - $auth_version = 'v2', + $auth_version = 'v3', $run_service_broker_tests = false, $ca_certificates_file = undef, $disable_ssl_validation = undef, diff --git a/releasenotes/notes/disable-keystone-v2-864c0aa1959deba1.yaml b/releasenotes/notes/disable-keystone-v2-864c0aa1959deba1.yaml new file mode 100644 index 00000000..972e7cf0 --- /dev/null +++ b/releasenotes/notes/disable-keystone-v2-864c0aa1959deba1.yaml @@ -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. diff --git a/spec/classes/tempest_init_spec.rb b/spec/classes/tempest_init_spec.rb index 46872df1..9f0c3e58 100644 --- a/spec/classes/tempest_init_spec.rb +++ b/spec/classes/tempest_init_spec.rb @@ -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/run_validation').with(:value => false) 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_secret( true ) 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/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 => 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('image-feature-enabled/api_v1').with(:value => true) is_expected.to contain_tempest_config('image-feature-enabled/api_v2').with(:value => true)