Remove deprecated keymgr_* parameters
These were deprecated in favor of the separate classes to customize
key manager, which were added during Xena cycle[1].
[1] e500bfe5e0
Change-Id: Iad3298e0b0cefd7049536820e21eb4ab69afec42
This commit is contained in:
Takashi Kajinami
parent
d8739ad539
commit
535a0cd16a
|
|
@ -255,24 +255,6 @@
|
|||
#
|
||||
# DEPRECATED PARAMETERS
|
||||
#
|
||||
# [*keymgr_backend*]
|
||||
# (optional) Key Manager service class.
|
||||
# Example of valid value: castellan.key_manager.barbican_key_manager.BarbicanKeyManager
|
||||
# Defaults to undef
|
||||
#
|
||||
# [*barbican_auth_endpoint*]
|
||||
# (optional) Keystone v3 API URL.
|
||||
# Example: http://localhost:5000/v3
|
||||
# Defaults to undef
|
||||
#
|
||||
# [*barbican_endpoint*]
|
||||
# (optional) Barbican URL.
|
||||
# Defaults to undef
|
||||
#
|
||||
# [*barbican_api_version*]
|
||||
# (optional) Barbican API version.
|
||||
# Defaults to undef
|
||||
#
|
||||
# [*virtio_nic*]
|
||||
# (optional) Whether to use virtio for the nic driver of VMs
|
||||
# Defaults to undef
|
||||
|
|
@ -328,10 +310,6 @@ class nova::compute (
|
|||
$block_device_allocate_retries = $::os_service_default,
|
||||
$block_device_allocate_retries_interval = $::os_service_default,
|
||||
# DEPRECATED PARAMETERS
|
||||
$keymgr_backend = undef,
|
||||
$barbican_auth_endpoint = undef,
|
||||
$barbican_endpoint = undef,
|
||||
$barbican_api_version = undef,
|
||||
$virtio_nic = undef,
|
||||
) {
|
||||
|
||||
|
|
@ -439,18 +417,6 @@ class nova::compute (
|
|||
value => $block_device_allocate_retries_interval;
|
||||
}
|
||||
|
||||
if $keymgr_backend != undef {
|
||||
warning('The keymgr_backend parameter has been deprecated. Use the nova::key_manager class')
|
||||
include nova::key_manager
|
||||
}
|
||||
|
||||
['barbican_auth_endpoint', 'barbican_endpoint', 'barbican_api_version'].each |String $barbican_opt| {
|
||||
if getvar("${barbican_opt}") != undef {
|
||||
warning("The ${barbican_opt} parameter is deprecated. Use the nova::key_manager::barbican class")
|
||||
}
|
||||
include nova::key_manager::barbican
|
||||
}
|
||||
|
||||
if ($vnc_enabled) {
|
||||
include nova::vncproxy::common
|
||||
|
||||
|
|
|
|||
|
|
@ -14,9 +14,7 @@ class nova::key_manager (
|
|||
|
||||
include nova::deps
|
||||
|
||||
$backend_real = pick($nova::compute::keymgr_backend, $backend)
|
||||
|
||||
oslo::key_manager { 'nova_config':
|
||||
backend => $backend_real,
|
||||
backend => $backend,
|
||||
}
|
||||
}
|
||||
|
|
|
|||
|
|
@ -50,10 +50,6 @@ class nova::key_manager::barbican (
|
|||
|
||||
include nova::deps
|
||||
|
||||
$barbican_endpoint_real = pick($nova::compute::barbican_endpoint, $barbican_endpoint)
|
||||
$auth_endpoint_real = pick($nova::compute::barbican_auth_endpoint, $auth_endpoint)
|
||||
$barbican_api_version_real = pick($nova::compute::barbican_api_version, $barbican_api_version)
|
||||
|
||||
# cryptsetup is required when Barbican is encrypting volumes
|
||||
ensure_packages('cryptsetup', {
|
||||
ensure => present,
|
||||
|
|
@ -61,9 +57,9 @@ class nova::key_manager::barbican (
|
|||
})
|
||||
|
||||
oslo::key_manager::barbican { 'nova_config':
|
||||
barbican_endpoint => $barbican_endpoint_real,
|
||||
barbican_api_version => $barbican_api_version_real,
|
||||
auth_endpoint => $auth_endpoint_real,
|
||||
barbican_endpoint => $barbican_endpoint,
|
||||
barbican_api_version => $barbican_api_version,
|
||||
auth_endpoint => $auth_endpoint,
|
||||
retry_delay => $retry_delay,
|
||||
number_of_retries => $number_of_retries,
|
||||
barbican_endpoint_type => $barbican_endpoint_type,
|
||||
|
|
|
|||
|
|
@ -0,0 +1,9 @@
|
|||
---
|
||||
upgrade:
|
||||
- |
|
||||
The following parameters of the ``nova::compute`` class have been removed.
|
||||
|
||||
- ``keymgr_backend``
|
||||
- ``barbican_auth_endpoint``
|
||||
- ``barbican_endpoint``
|
||||
- ``barbican_api_version``
|
||||
|
|
@ -103,10 +103,6 @@ describe 'nova::compute' do
|
|||
:resize_confirm_window => '3',
|
||||
:shutdown_timeout => '100',
|
||||
:resume_guests_state_on_host_boot => true,
|
||||
:keymgr_backend => 'castellan.key_manager.barbican_key_manager.BarbicanKeyManager',
|
||||
:barbican_endpoint => 'http://localhost',
|
||||
:barbican_api_version => 'v1',
|
||||
:barbican_auth_endpoint => 'http://127.0.0.1:5000/v3',
|
||||
:max_concurrent_builds => 15,
|
||||
:max_concurrent_live_migrations => '4',
|
||||
:sync_power_state_pool_size => '10',
|
||||
|
|
@ -141,14 +137,6 @@ describe 'nova::compute' do
|
|||
})
|
||||
end
|
||||
|
||||
it 'configures barbican service' do
|
||||
is_expected.to contain_nova_config('key_manager/backend').with_value('castellan.key_manager.barbican_key_manager.BarbicanKeyManager')
|
||||
is_expected.to contain_nova_config('barbican/barbican_endpoint').with_value('http://localhost')
|
||||
is_expected.to contain_nova_config('barbican/barbican_api_version').with_value('v1')
|
||||
is_expected.to contain_nova_config('barbican/auth_endpoint').with_value('http://127.0.0.1:5000/v3')
|
||||
is_expected.to contain_package('cryptsetup').with_ensure('installed')
|
||||
end
|
||||
|
||||
it 'configures vnc in nova.conf' do
|
||||
is_expected.to contain_nova_config('vnc/enabled').with_value(true)
|
||||
is_expected.to contain_nova_config('vnc/server_proxyclient_address').with_value('127.0.0.1')
|
||||
|
|
|
|||
Loading…
Reference in New Issue