Rename inspect_timeout to inspect_wait_timeout
... to make the parameter name consistent with the actual parameter in ironic. Change-Id: I4eb34f578f0a00dd8fe23acd5366f3983798c458
This commit is contained in:
parent
73d39c09c1
commit
19851a4d62
|
@ -99,7 +99,7 @@
|
|||
# configdrive_use_object_store is true.
|
||||
# Defaults to $::os_service_default
|
||||
#
|
||||
# [*inspect_timeout*]
|
||||
# [*inspect_wait_timeout*]
|
||||
# (optional) Timeout (seconds) for waiting for node inspection.
|
||||
# 0 for unlimited.
|
||||
# Defaults to $::os_service_default
|
||||
|
@ -209,6 +209,11 @@
|
|||
# the database. Recommended for bigger config drives.
|
||||
# Defaults to undef
|
||||
#
|
||||
# [*inspect_timeout*]
|
||||
# (optional) Timeout (seconds) for waiting for node inspection.
|
||||
# 0 for unlimited.
|
||||
# Defaults to undef
|
||||
#
|
||||
class ironic::conductor (
|
||||
$package_ensure = 'present',
|
||||
$enabled = true,
|
||||
|
@ -226,7 +231,7 @@ class ironic::conductor (
|
|||
$inspection_network = $::os_service_default,
|
||||
$configdrive_use_object_store = $::os_service_default,
|
||||
$configdrive_swift_container = $::os_service_default,
|
||||
$inspect_timeout = $::os_service_default,
|
||||
$inspect_wait_timeout = $::os_service_default,
|
||||
$default_boot_option = $::os_service_default,
|
||||
$default_boot_mode = $::os_service_default,
|
||||
$port_setup_delay = $::os_service_default,
|
||||
|
@ -248,6 +253,7 @@ class ironic::conductor (
|
|||
$max_time_interval = undef,
|
||||
$api_url = undef,
|
||||
$configdrive_use_swift = undef,
|
||||
$inspect_timeout = undef,
|
||||
) {
|
||||
|
||||
include ironic::deps
|
||||
|
@ -276,6 +282,14 @@ in a future release. Use configdrive_use_object_store instead')
|
|||
$configdrive_use_object_store_real = $configdrive_use_object_store
|
||||
}
|
||||
|
||||
if $inspect_timeout != undef {
|
||||
warning('inspect_timeout is deprecated and will be removed in a future release. \
|
||||
Use inspect_wait_timeout instead')
|
||||
$inspect_wait_timeout_real = $inspect_timeout
|
||||
} else {
|
||||
$inspect_wait_timeout_real = $inspect_wait_timeout
|
||||
}
|
||||
|
||||
if ($cleaning_network_name and !is_service_default($cleaning_network)) {
|
||||
fail('cleaning_network_name and cleaning_network can not be specified at the same time.')
|
||||
}
|
||||
|
@ -346,7 +360,7 @@ in a future release. Use configdrive_use_object_store instead')
|
|||
'deploy/continue_if_disk_secure_erase_fails': value => $continue_if_disk_secure_erase_fails;
|
||||
'deploy/configdrive_use_object_store': value => $configdrive_use_object_store_real;
|
||||
'conductor/configdrive_swift_container': value => $configdrive_swift_container;
|
||||
'conductor/inspect_wait_timeout': value => $inspect_timeout;
|
||||
'conductor/inspect_wait_timeout': value => $inspect_wait_timeout_real;
|
||||
'deploy/default_boot_option': value => $default_boot_option;
|
||||
'deploy/default_boot_mode': value => $default_boot_mode;
|
||||
'neutron/port_setup_delay': value => $port_setup_delay;
|
||||
|
|
|
@ -0,0 +1,5 @@
|
|||
---
|
||||
deprecations:
|
||||
- |
|
||||
The ``ironic::conductor::inspect_timeout`` has been deprecated and will be
|
||||
removed in a future release. Use ``inspect_wait_timeout`` instead.
|
|
@ -102,7 +102,7 @@ describe 'ironic::conductor' do
|
|||
:force_raw_images => false,
|
||||
:configdrive_use_object_store => true,
|
||||
:configdrive_swift_container => 'cont',
|
||||
:inspect_timeout => 600,
|
||||
:inspect_wait_timeout => 600,
|
||||
:default_boot_option => 'local',
|
||||
:default_boot_mode => 'uefi',
|
||||
:port_setup_delay => '15',
|
||||
|
@ -134,7 +134,7 @@ describe 'ironic::conductor' do
|
|||
is_expected.to contain_ironic_config('DEFAULT/force_raw_images').with_value(p[:force_raw_images])
|
||||
is_expected.to contain_ironic_config('deploy/configdrive_use_object_store').with_value(p[:configdrive_use_object_store])
|
||||
is_expected.to contain_ironic_config('conductor/configdrive_swift_container').with_value(p[:configdrive_swift_container])
|
||||
is_expected.to contain_ironic_config('conductor/inspect_wait_timeout').with_value(p[:inspect_timeout])
|
||||
is_expected.to contain_ironic_config('conductor/inspect_wait_timeout').with_value(p[:inspect_wait_timeout])
|
||||
is_expected.to contain_ironic_config('deploy/default_boot_option').with_value(p[:default_boot_option])
|
||||
is_expected.to contain_ironic_config('deploy/default_boot_mode').with_value(p[:default_boot_mode])
|
||||
is_expected.to contain_ironic_config('neutron/port_setup_delay').with_value(p[:port_setup_delay])
|
||||
|
|
Loading…
Reference in New Issue