openstack/puppet-cinder
Code Issues Proposed changes

Change default value for keymgr_backend to default

Browse Source 
This changes the default value for keymgr_backend to
the service default from the invalid value [1] that
is used now.

Since Stein and after stevedore fails to load that
class [2].

[1] cinder.keymgr.conf_key_mgr.ConfKeyManager
[2] http://paste.openstack.org/show/782285/

Change-Id: I67ddc2e5a090c99ef2fad64348fcec705b773afa
This commit is contained in:
Tobias Urdin
2019-10-09 10:30:25 +02:00
parent bfa6a95e60
commit 235fe651dd
3 changed files with 21 additions and 31 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
manifests/api.pp
View File

@@ -118,11 +118,12 @@
# (optional) What port the API listens on. Defaults to $::os_service_default # (optional) What port the API listens on. Defaults to $::os_service_default
# If this value is modified the catalog URLs in the keystone::auth class # If this value is modified the catalog URLs in the keystone::auth class
# will also need to be changed to match. # will also need to be changed to match.
# Defaults to $::os_service_default
# #
# [*keymgr_backend*] # [*keymgr_backend*]
# (optional) Key Manager service class. # (optional) Key Manager service class.
# Example of valid value: castellan.key_manager.barbican_key_manager.BarbicanKeyManager # Example of valid value: barbican
# Defaults to 'cinder.keymgr.conf_key_mgr.ConfKeyManager'. # Defaults to $::os_service_default
# #
class cinder::api ( class cinder::api (
$os_region_name = $::os_service_default, $os_region_name = $::os_service_default,
@@ -151,7 +152,7 @@ class cinder::api (
$ca_file = $::os_service_default, $ca_file = $::os_service_default,
$auth_strategy = 'keystone', $auth_strategy = 'keystone',
$osapi_volume_listen_port = $::os_service_default, $osapi_volume_listen_port = $::os_service_default,
$keymgr_backend = 'cinder.keymgr.conf_key_mgr.ConfKeyManager', $keymgr_backend = $::os_service_default,
) inherits cinder::params { ) inherits cinder::params {
include ::cinder::deps include ::cinder::deps

5
releasenotes/notes/default-value-change-keymgr_backend-4a627bb17e688e18.yaml Normal file
View File

@@ -0,0 +1,5 @@
---
upgrade:
- |
The default value of cinder::api::keymgr_backend is changed from the invalid
value cinder.keymgr.conf_key_mgr.ConfKeyManager to service default.

40
spec/classes/cinder_api_spec.rb
View File

@@ -24,35 +24,19 @@ describe 'cinder::api' do
)} )}
it 'should configure cinder api correctly' do it 'should configure cinder api correctly' do
is_expected.to contain_cinder_config('DEFAULT/osapi_volume_listen').with( is_expected.to contain_cinder_config('DEFAULT/osapi_volume_listen').with_value('0.0.0.0')
:value => '0.0.0.0' is_expected.to contain_cinder_config('DEFAULT/osapi_volume_workers').with_value('8')
) is_expected.to contain_cinder_config('DEFAULT/default_volume_type').with_value('<SERVICE DEFAULT>')
is_expected.to contain_cinder_config('DEFAULT/osapi_volume_workers').with( is_expected.to contain_cinder_config('DEFAULT/public_endpoint').with_value('<SERVICE DEFAULT>')
:value => '8' is_expected.to contain_cinder_config('DEFAULT/osapi_volume_base_URL').with_value('<SERVICE DEFAULT>')
) is_expected.to contain_cinder_config('DEFAULT/osapi_max_limit').with_value('<SERVICE DEFAULT>')
is_expected.to contain_cinder_config('DEFAULT/default_volume_type').with( is_expected.to contain_cinder_config('DEFAULT/os_region_name').with_value('<SERVICE DEFAULT>')
:value => '<SERVICE DEFAULT>' is_expected.to contain_cinder_config('DEFAULT/auth_strategy').with_value('keystone')
) is_expected.to contain_cinder_config('key_manager/backend').with_value('<SERVICE DEFAULT>')
is_expected.to contain_cinder_config('DEFAULT/public_endpoint').with(
:value => '<SERVICE DEFAULT>'
)
is_expected.to contain_cinder_config('DEFAULT/osapi_volume_base_URL').with(
:value => '<SERVICE DEFAULT>'
)
is_expected.to contain_cinder_config('DEFAULT/osapi_max_limit').with(
:value => '<SERVICE DEFAULT>'
)
is_expected.to contain_cinder_config('DEFAULT/os_region_name').with(
:value => '<SERVICE DEFAULT>'
)
is_expected.to contain_cinder_config('DEFAULT/auth_strategy').with(
:value => 'keystone'
)
is_expected.to contain_cinder_config('key_manager/backend').with_value('cinder.keymgr.conf_key_mgr.ConfKeyManager')
is_expected.to contain_cinder_config('barbican/barbican_endpoint').with_value('<SERVICE DEFAULT>') is_expected.to contain_cinder_config('barbican/barbican_endpoint').with_value('<SERVICE DEFAULT>')
is_expected.to contain_cinder_config('barbican/auth_endpoint').with_value('<SERVICE DEFAULT>') is_expected.to contain_cinder_config('barbican/auth_endpoint').with_value('<SERVICE DEFAULT>')
is_expected.to contain_cinder_config('DEFAULT/osapi_volume_listen_port').with('value' => '<SERVICE DEFAULT>') is_expected.to contain_cinder_config('DEFAULT/osapi_volume_listen_port').with('value' => '<SERVICE DEFAULT>')
is_expected.to contain_oslo__middleware('cinder_config').with( is_expected.to contain_oslo__middleware('cinder_config').with(
:enable_proxy_headers_parsing => '<SERVICE DEFAULT>', :enable_proxy_headers_parsing => '<SERVICE DEFAULT>',
:max_request_body_size => '<SERVICE DEFAULT>', :max_request_body_size => '<SERVICE DEFAULT>',
@@ -259,13 +243,13 @@ describe 'cinder::api' do
context 'with barbican parameters' do context 'with barbican parameters' do
let :params do let :params do
req_params.merge!({ req_params.merge!({
:keymgr_backend => 'castellan.key_manager.barbican_key_manager.BarbicanKeyManager', :keymgr_backend => 'barbican',
:keymgr_encryption_api_url => 'https://localhost:9311/v1', :keymgr_encryption_api_url => 'https://localhost:9311/v1',
:keymgr_encryption_auth_url => 'https://localhost:5000/v3', :keymgr_encryption_auth_url => 'https://localhost:5000/v3',
}) })
end end
it 'should set keymgr parameters' do it 'should set keymgr parameters' do
is_expected.to contain_cinder_config('key_manager/backend').with_value('castellan.key_manager.barbican_key_manager.BarbicanKeyManager') is_expected.to contain_cinder_config('key_manager/backend').with_value('barbican')
is_expected.to contain_cinder_config('barbican/barbican_endpoint').with_value('https://localhost:9311/v1') is_expected.to contain_cinder_config('barbican/barbican_endpoint').with_value('https://localhost:9311/v1')
is_expected.to contain_cinder_config('barbican/auth_endpoint').with_value('https://localhost:5000/v3') is_expected.to contain_cinder_config('barbican/auth_endpoint').with_value('https://localhost:5000/v3')
end end