Skip to content

Commit d513dce

Browse files
Merge pull request #10 from k0rdent/add-onoff-timeout
(:sparkles:) make ironic conductor timeouts configurable
2 parents 02732d8 + 84f8bc8 commit d513dce

File tree

2 files changed

+6
-1
lines changed

2 files changed

+6
-1
lines changed

ironic-config/ironic.conf.j2

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -89,7 +89,8 @@ verify_step_priority_override = management.clear_job_queue:90
8989
# We don't use this feature, and it creates an additional load on the database
9090
node_history = False
9191
# Provide for a timeout longer than 60 seconds for certain vendor's hardware
92-
power_state_change_timeout = 120
92+
power_state_change_timeout = {{ env.IRONIC_POWER_STATE_CHANGE_TIMEOUT }}
93+
inspect_wait_timeout = {{ env.IRONIC_INSPECT_WAIT_TIMEOUT }}
9394
{% if env.DEPLOY_KERNEL_URL is defined %}
9495
# Fallback deploy_kernel when cpu_arch is not set
9596
deploy_kernel = {{ env.DEPLOY_KERNEL_URL }}

scripts/ironic-common.sh

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -144,3 +144,7 @@ export IRONIC_ACCESS_PORT=${IRONIC_ACCESS_PORT:-6385}
144144
export IRONIC_LISTEN_PORT=${IRONIC_LISTEN_PORT:-$IRONIC_ACCESS_PORT}
145145

146146
export IRONIC_ENABLE_DISCOVERY=${IRONIC_ENABLE_DISCOVERY:-${IRONIC_INSPECTOR_ENABLE_DISCOVERY:-false}}
147+
148+
export IRONIC_POWER_STATE_CHANGE_TIMEOUT=${IRONIC_POWER_STATE_CHANGE_TIMEOUT:-120}
149+
150+
export IRONIC_INSPECT_WAIT_TIMEOUT=${IRONIC_INSPECT_WAIT_TIMEOUT:-1800}

0 commit comments

Comments
 (0)