openstack/puppet-cinder
Code Issues Proposed changes

Deprecate cinder::api::nova_catalog_admin_info parameter

Browse Source 
This is no longer present in the cinder code-base, so there's no use in
keeping configuring it. Thus, I moved it to the deprecated section and
now it's unused.

Change-Id: I80b27d06b802db3cffe24db6a8fb79a9ad30a460
This commit is contained in:
Juan Antonio Osorio Robles 2018-04-10 12:38:40 +03:00
parent dae8f40415
commit 8bffeef9cc
3 changed files with 11 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
manifests/api.pp
View File

@ -47,10 +47,6 @@
# catalog.
# Defaults to 'compute:Compute Service:publicURL'
#
# [*nova_catalog_admin_info*]
# (optional) Same as nova_catalog_info, but for admin endpoint.
# Defaults to 'compute:Compute Service:adminURL'
#
# [*service_workers*]
# (optional) Number of cinder-api workers
# Defaults to $::os_workers
@ -174,9 +170,12 @@
# Example of valid value: castellan.key_manager.barbican_key_manager.BarbicanKeyManager
# Defaults to undef.
#
# [*nova_catalog_admin_info*]
# (optional) Same as nova_catalog_info, but for admin endpoint.
# Defaults to 'compute:Compute Service:adminURL'
#
class cinder::api (
$nova_catalog_info = 'compute:Compute Service:publicURL',
$nova_catalog_admin_info = 'compute:Compute Service:adminURL',
$os_region_name = $::os_service_default,
$privileged_user = false,
$os_privileged_user_name = $::os_service_default,
@ -211,6 +210,7 @@ class cinder::api (
# DEPRECATED PARAMETERS
$validation_options = {},
$keymgr_api_class = undef,
$nova_catalog_admin_info = 'compute:Compute Service:adminURL',
) inherits cinder::params {
include ::cinder::deps
@ -303,7 +303,6 @@ running as a standalone service, or httpd for being run by a httpd server")
cinder_config {
'DEFAULT/nova_catalog_info': value => $nova_catalog_info;
'DEFAULT/nova_catalog_admin_info': value => $nova_catalog_admin_info;
}
oslo::middleware {'cinder_config':

6
releasenotes/notes/Deprecate-nova_catalog_admin_info-6e006bbd8126ef92.yaml Normal file
View File

@ -0,0 +1,6 @@
---
deprecations:
- |
The nova_catalog_admin_info parameter was deprecated from cinder and is no
longer being used in the cinder code-base. So, the parameter with the same
name in the api.pp manifest was set as deprecated as well.

5
spec/classes/cinder_api_spec.rb
View File

@ -34,9 +34,6 @@ describe 'cinder::api' do
is_expected.to contain_cinder_config('DEFAULT/nova_catalog_info').with(
:value => 'compute:Compute Service:publicURL'
)
is_expected.to contain_cinder_config('DEFAULT/nova_catalog_admin_info').with(
:value => 'compute:Compute Service:adminURL'
)
is_expected.to contain_cinder_config('DEFAULT/default_volume_type').with(
:value => '<SERVICE DEFAULT>'
)
@ -73,11 +70,9 @@ describe 'cinder::api' do
describe 'with a custom nova_catalog params' do
let :params do
req_params.merge({
'nova_catalog_admin_info' => 'compute:nova:adminURL',
'nova_catalog_info' => 'compute:nova:publicURL',
})
end
it { is_expected.to contain_cinder_config('DEFAULT/nova_catalog_admin_info').with_value('compute:nova:adminURL') }
it { is_expected.to contain_cinder_config('DEFAULT/nova_catalog_info').with_value('compute:nova:publicURL') }
end