Merge "default_availability_zone: Deprecate usage of false values"
This commit is contained in:
commit
069c8b100b
@ -190,7 +190,7 @@
|
|||||||
# (optional) Default availability zone for new volumes.
|
# (optional) Default availability zone for new volumes.
|
||||||
# If not set, the storage_availability_zone option value is used as
|
# If not set, the storage_availability_zone option value is used as
|
||||||
# the default for new volumes.
|
# the default for new volumes.
|
||||||
# Defaults to false
|
# Defaults to undef
|
||||||
#
|
#
|
||||||
# [*allow_availability_zone_fallback*]
|
# [*allow_availability_zone_fallback*]
|
||||||
# (optional) Allow availability zone fallback if preferred availability zone cannot be deployed to.
|
# (optional) Allow availability zone fallback if preferred availability zone cannot be deployed to.
|
||||||
@ -299,7 +299,7 @@ class cinder (
|
|||||||
$package_ensure = 'present',
|
$package_ensure = 'present',
|
||||||
$api_paste_config = '/etc/cinder/api-paste.ini',
|
$api_paste_config = '/etc/cinder/api-paste.ini',
|
||||||
$storage_availability_zone = 'nova',
|
$storage_availability_zone = 'nova',
|
||||||
$default_availability_zone = false,
|
$default_availability_zone = undef,
|
||||||
$allow_availability_zone_fallback = $facts['os_service_default'],
|
$allow_availability_zone_fallback = $facts['os_service_default'],
|
||||||
$lock_path = $::cinder::params::lock_path,
|
$lock_path = $::cinder::params::lock_path,
|
||||||
$image_conversion_dir = $facts['os_service_default'],
|
$image_conversion_dir = $facts['os_service_default'],
|
||||||
@ -376,6 +376,10 @@ class cinder (
|
|||||||
}
|
}
|
||||||
|
|
||||||
if ! $default_availability_zone {
|
if ! $default_availability_zone {
|
||||||
|
if $default_availability_zone != undef {
|
||||||
|
warning("Usage of a false value for the default_availability_zone parameter \
|
||||||
|
is deprecated. Use undef instead.")
|
||||||
|
}
|
||||||
$default_availability_zone_real = $storage_availability_zone
|
$default_availability_zone_real = $storage_availability_zone
|
||||||
} else {
|
} else {
|
||||||
$default_availability_zone_real = $default_availability_zone
|
$default_availability_zone_real = $default_availability_zone
|
||||||
|
@ -0,0 +1,6 @@
|
|||||||
|
---
|
||||||
|
deprecations:
|
||||||
|
- |
|
||||||
|
Usage of `false` for the ``cinder::default_availability_zone`` parameter
|
||||||
|
has been deprecated and will be removed in a future release. Use ``undef``
|
||||||
|
(which is the new default value) instead.
|
Loading…
Reference in New Issue
Block a user