Remove support for [nova] auth_section
It was deprecated during the previous cycle[1]. [1] 2e6f49c1feeceed31e03c4e86fb4f005b9c49d7b Change-Id: I5742bfc9d9aa4169fafcf5f237722fed3863bad6
This commit is contained in:
parent
0bf6569c11
commit
120a71a8ed
@ -77,13 +77,6 @@
|
||||
# (Optional) Scope for system operations
|
||||
# Defaults to $facts['os_service_default']
|
||||
#
|
||||
# DEPRECATED PARAMETERS
|
||||
#
|
||||
# [*auth_section*]
|
||||
# (Optional) Config Section from which to load plugin
|
||||
# specific options.
|
||||
# Defaults to undef
|
||||
#
|
||||
class cinder::nova (
|
||||
$password,
|
||||
$region_name = $facts['os_service_default'],
|
||||
@ -103,16 +96,10 @@ class cinder::nova (
|
||||
$project_name = 'services',
|
||||
$project_domain_name = 'Default',
|
||||
$system_scope = $facts['os_service_default'],
|
||||
# DEPRECATED PARAMETERS
|
||||
$auth_section = undef,
|
||||
) {
|
||||
|
||||
include cinder::deps
|
||||
|
||||
if $auth_section {
|
||||
warning('The auth_section parameter has been deprecated.')
|
||||
}
|
||||
|
||||
if is_service_default($system_scope) {
|
||||
$project_name_real = $project_name
|
||||
$project_domain_name_real = $project_domain_name
|
||||
@ -133,7 +120,6 @@ class cinder::nova (
|
||||
'nova/collect_timing': value => $collect_timing;
|
||||
'nova/split_loggers': value => $split_loggers;
|
||||
'nova/auth_type': value => $auth_type;
|
||||
'nova/auth_section': value => pick($auth_section, $facts['os_service_default']);
|
||||
'nova/auth_url': value => $auth_url;
|
||||
'nova/username': value => $username;
|
||||
'nova/user_domain_name': value => $user_domain_name;
|
||||
|
@ -0,0 +1,4 @@
|
||||
---
|
||||
upgrade:
|
||||
- |
|
||||
The ``cinder::nova::auth_section`` parameter has been removed.
|
@ -19,7 +19,6 @@ describe 'cinder::nova' do
|
||||
is_expected.to contain_cinder_config('nova/collect_timing').with_value('<SERVICE DEFAULT>')
|
||||
is_expected.to contain_cinder_config('nova/split_loggers').with_value('<SERVICE DEFAULT>')
|
||||
is_expected.to contain_cinder_config('nova/auth_type').with_value('password')
|
||||
is_expected.to contain_cinder_config('nova/auth_section').with_value('<SERVICE DEFAULT>')
|
||||
is_expected.to contain_cinder_config('nova/auth_url').with_value('<SERVICE DEFAULT>')
|
||||
is_expected.to contain_cinder_config('nova/username').with_value('nova')
|
||||
is_expected.to contain_cinder_config('nova/user_domain_name').with_value('Default')
|
||||
@ -44,7 +43,6 @@ describe 'cinder::nova' do
|
||||
:collect_timing => true,
|
||||
:split_loggers => true,
|
||||
:auth_type => 'v3password',
|
||||
:auth_section => 'my_section',
|
||||
:auth_url => 'http://127.0.0.2:5000',
|
||||
})
|
||||
end
|
||||
@ -61,7 +59,6 @@ describe 'cinder::nova' do
|
||||
is_expected.to contain_cinder_config('nova/collect_timing').with_value(true)
|
||||
is_expected.to contain_cinder_config('nova/split_loggers').with_value(true)
|
||||
is_expected.to contain_cinder_config('nova/auth_type').with_value('v3password')
|
||||
is_expected.to contain_cinder_config('nova/auth_section').with_value('my_section')
|
||||
is_expected.to contain_cinder_config('nova/auth_url').with_value('http://127.0.0.2:5000')
|
||||
is_expected.to contain_cinder_config('nova/username').with_value('nova')
|
||||
is_expected.to contain_cinder_config('nova/user_domain_name').with_value('Default')
|
||||
|
Loading…
x
Reference in New Issue
Block a user