Merge "Remove deprecated/ineffective upgrade_level_console"
This commit is contained in:
commit
c43a5e8900
|
@ -380,10 +380,6 @@
|
||||||
# <service_type>:<service_name>:<endpoint_type>
|
# <service_type>:<service_name>:<endpoint_type>
|
||||||
# Defaults to undef
|
# Defaults to undef
|
||||||
#
|
#
|
||||||
# [*upgrade_level_console*]
|
|
||||||
# (optional) Sets a version cap for messages sent to console services
|
|
||||||
# Defaults to undef
|
|
||||||
#
|
|
||||||
# [*block_device_allocate_retries*]
|
# [*block_device_allocate_retries*]
|
||||||
# (optional) Number of times to retry block device allocation on failures
|
# (optional) Number of times to retry block device allocation on failures
|
||||||
# Defaults to undef.
|
# Defaults to undef.
|
||||||
|
@ -477,7 +473,6 @@ class nova(
|
||||||
$auth_strategy = undef,
|
$auth_strategy = undef,
|
||||||
$os_region_name = undef,
|
$os_region_name = undef,
|
||||||
$cinder_catalog_info = undef,
|
$cinder_catalog_info = undef,
|
||||||
$upgrade_level_console = undef,
|
|
||||||
$block_device_allocate_retries = undef,
|
$block_device_allocate_retries = undef,
|
||||||
$block_device_allocate_retries_interval = undef,
|
$block_device_allocate_retries_interval = undef,
|
||||||
$cross_az_attach = undef,
|
$cross_az_attach = undef,
|
||||||
|
@ -501,11 +496,6 @@ in a future release. Use nova::cinder::os_region_name instead')
|
||||||
in a future release. Use nova::cinder::catalog_info instead')
|
in a future release. Use nova::cinder::catalog_info instead')
|
||||||
}
|
}
|
||||||
|
|
||||||
if $upgrade_level_console != undef {
|
|
||||||
warning('The upgrade_level_console parameter is deprecated, and has \
|
|
||||||
no effect.')
|
|
||||||
}
|
|
||||||
|
|
||||||
if $block_device_allocate_retries != undef {
|
if $block_device_allocate_retries != undef {
|
||||||
warning('The block_device_allocate_retries parameter is deprecated. \
|
warning('The block_device_allocate_retries parameter is deprecated. \
|
||||||
Use nova::compute::block_device_allocate_retries instead')
|
Use nova::compute::block_device_allocate_retries instead')
|
||||||
|
|
|
@ -0,0 +1,4 @@
|
||||||
|
---
|
||||||
|
upgrade:
|
||||||
|
- |
|
||||||
|
The ``nova::upgrade_level_console`` parameter was removed.
|
Loading…
Reference in New Issue