Merge "Deprecate ineffective periodic_interval"
This commit is contained in:
commit
306c22c3d3
@ -190,10 +190,6 @@
|
|||||||
# On RHEL will be '/var/lib/nova/tmp' and on Debian '/var/lock/nova'
|
# On RHEL will be '/var/lib/nova/tmp' and on Debian '/var/lock/nova'
|
||||||
# Defaults to $::nova::params::lock_path
|
# Defaults to $::nova::params::lock_path
|
||||||
#
|
#
|
||||||
# [*periodic_interval*]
|
|
||||||
# (optional) Seconds between running periodic tasks.
|
|
||||||
# Defaults to '60'
|
|
||||||
#
|
|
||||||
# [*report_interval*]
|
# [*report_interval*]
|
||||||
# (optional) Interval at which nodes report to data store.
|
# (optional) Interval at which nodes report to data store.
|
||||||
# Defaults to '10'
|
# Defaults to '10'
|
||||||
@ -370,6 +366,10 @@
|
|||||||
# (optional) Sets a version cap for messages sent between cells services
|
# (optional) Sets a version cap for messages sent between cells services
|
||||||
# Defaults to undef
|
# Defaults to undef
|
||||||
#
|
#
|
||||||
|
# [*periodic_interval*]
|
||||||
|
# (optional) Seconds between running periodic tasks.
|
||||||
|
# Defaults to undef
|
||||||
|
#
|
||||||
class nova(
|
class nova(
|
||||||
$ensure_package = 'present',
|
$ensure_package = 'present',
|
||||||
$default_transport_url = $facts['os_service_default'],
|
$default_transport_url = $facts['os_service_default'],
|
||||||
@ -410,7 +410,6 @@ class nova(
|
|||||||
$service_down_time = 60,
|
$service_down_time = 60,
|
||||||
$state_path = '/var/lib/nova',
|
$state_path = '/var/lib/nova',
|
||||||
$lock_path = $::nova::params::lock_path,
|
$lock_path = $::nova::params::lock_path,
|
||||||
$periodic_interval = '60',
|
|
||||||
$report_interval = '10',
|
$report_interval = '10',
|
||||||
$rootwrap_config = '/etc/nova/rootwrap.conf',
|
$rootwrap_config = '/etc/nova/rootwrap.conf',
|
||||||
Boolean $use_ssl = false,
|
Boolean $use_ssl = false,
|
||||||
@ -449,6 +448,7 @@ class nova(
|
|||||||
$upgrade_level_cert = undef,
|
$upgrade_level_cert = undef,
|
||||||
$upgrade_level_cells = undef,
|
$upgrade_level_cells = undef,
|
||||||
$upgrade_level_intercell = undef,
|
$upgrade_level_intercell = undef,
|
||||||
|
$periodic_interval = undef,
|
||||||
) inherits nova::params {
|
) inherits nova::params {
|
||||||
|
|
||||||
include nova::deps
|
include nova::deps
|
||||||
@ -469,6 +469,10 @@ in a future release.")
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
if $periodic_interval != undef {
|
||||||
|
warning('The periodic_interval parameter is deprecated and has no effect.')
|
||||||
|
}
|
||||||
|
|
||||||
if $use_ssl {
|
if $use_ssl {
|
||||||
if !$cert_file {
|
if !$cert_file {
|
||||||
fail('The cert_file parameter is required when use_ssl is set to true')
|
fail('The cert_file parameter is required when use_ssl is set to true')
|
||||||
|
@ -0,0 +1,5 @@
|
|||||||
|
---
|
||||||
|
deprecations:
|
||||||
|
- |
|
||||||
|
The ``nova::periodic_interval`` parameter has been deprecated, because this
|
||||||
|
parameter has had no effect.
|
Loading…
Reference in New Issue
Block a user