Remove support for [api] auth_strategy
The option was removed from nova. Depends-on: https://review.opendev.org/952272 Change-Id: I64941cb4c6ee4ce9c4ea5de2ef5ea15b7361375a Signed-off-by: Takashi Kajinami <kajinamit@oss.nttdata.com>
This commit is contained in:
@@ -353,10 +353,6 @@
|
||||
#
|
||||
# DEPRECATED PARAMETERS
|
||||
#
|
||||
# [*auth_strategy*]
|
||||
# (optional) The strategy to use for auth: noauth or keystone.
|
||||
# Defaults to undef
|
||||
#
|
||||
# [*rabbit_heartbeat_in_pthread*]
|
||||
# (Optional) EXPERIMENTAL: Run the health check heartbeat thread
|
||||
# through a native python thread. By default if this
|
||||
@@ -436,7 +432,6 @@ class nova(
|
||||
$instance_name_template = $facts['os_service_default'],
|
||||
$cell_worker_thread_pool_size = $facts['os_service_default'],
|
||||
# DEPRECATED PARAMETERS
|
||||
$auth_strategy = undef,
|
||||
$rabbit_heartbeat_in_pthread = undef,
|
||||
$use_ssl = undef,
|
||||
$enabled_ssl_apis = undef,
|
||||
@@ -508,13 +503,6 @@ class nova(
|
||||
purge => $purge_config,
|
||||
}
|
||||
|
||||
if $auth_strategy {
|
||||
warning('The auth_strategy parameter is deprecated, and will be removed in a future release.')
|
||||
}
|
||||
nova_config {
|
||||
'api/auth_strategy': value => pick($auth_strategy, $facts['os_service_default']);
|
||||
}
|
||||
|
||||
nova_config {
|
||||
'DEFAULT/record': value => $record;
|
||||
'DEFAULT/ssl_only': value => $ssl_only;
|
||||
|
@@ -0,0 +1,4 @@
|
||||
---
|
||||
upgrade:
|
||||
- |
|
||||
The ``nova::auth_strategy`` parameter has been removed.
|
@@ -25,10 +25,6 @@ describe 'nova' do
|
||||
is_expected.to contain_nova_config('DEFAULT/rootwrap_config').with_value('/etc/nova/rootwrap.conf')
|
||||
end
|
||||
|
||||
it 'does not configure auth_strategy' do
|
||||
is_expected.to contain_nova_config('api/auth_strategy').with_value('<SERVICE DEFAULT>')
|
||||
end
|
||||
|
||||
it 'configures rabbit' do
|
||||
is_expected.to contain_oslo__messaging__default('nova_config').with(
|
||||
:executor_thread_pool_size => '<SERVICE DEFAULT>',
|
||||
@@ -140,7 +136,6 @@ describe 'nova' do
|
||||
:lock_path => '/var/locky/path',
|
||||
:state_path => '/var/lib/nova2',
|
||||
:service_down_time => '60',
|
||||
:auth_strategy => 'foo',
|
||||
:ensure_package => '2012.1.1-15.el6',
|
||||
:host => 'test-001.example.org',
|
||||
:notification_transport_url => 'rabbit://rabbit_user:password@localhost:5673',
|
||||
@@ -183,10 +178,6 @@ describe 'nova' do
|
||||
})
|
||||
end
|
||||
|
||||
it 'configures auth_strategy' do
|
||||
is_expected.to contain_nova_config('api/auth_strategy').with_value('foo')
|
||||
end
|
||||
|
||||
it 'configures rabbit' do
|
||||
is_expected.to contain_oslo__messaging__default('nova_config').with(
|
||||
:executor_thread_pool_size => 64,
|
||||
|
Reference in New Issue
Block a user