Remove hard-coded DEPLOYWAIT timeout from Baremetal Scenario

Currently the baremetal scenario is hardcoded to wait 15 seconds
for the ironic node to reach the wait-callback state. This patch
adds a configuration option for this timeout and replaces the
hardcoded value with it.

Closes-Bug: #1526466

Change-Id: I8cded9467dc03d9e1a75222bb4b017604ae946af
This commit is contained in:
Mike Turek 2016-01-18 19:35:29 +00:00 committed by Mauro Rodrigues
parent 57e3ba1af8
commit 3843f5510a
2 changed files with 5 additions and 1 deletions

View File

@ -44,6 +44,10 @@ BaremetalGroup = [
'publicURL', 'adminURL', 'internalURL'],
help="The endpoint type to use for the baremetal provisioning "
"service"),
cfg.IntOpt('deploywait_timeout',
default=15,
help="Timeout for Ironic node to reach the "
"wait-callback state after powering on."),
cfg.IntOpt('active_timeout',
default=300,
help="Timeout for Ironic node to completely provision"),

View File

@ -156,7 +156,7 @@ class BaremetalScenarioTest(manager.ScenarioTest):
self.node['uuid'],
[BaremetalProvisionStates.DEPLOYWAIT,
BaremetalProvisionStates.ACTIVE],
timeout=15)
timeout=CONF.baremetal.deploywait_timeout)
self.wait_provisioning_state(self.node['uuid'],
BaremetalProvisionStates.ACTIVE,