diff options
| author | Zuul <zuul@review.opendev.org> | 2019-09-23 12:58:26 +0000 |
|---|---|---|
| committer | Gerrit Code Review <review@openstack.org> | 2019-09-23 12:58:26 +0000 |
| commit | 0450c4f2fde1567d25b63503ca6f0b5b2db25235 (patch) | |
| tree | c38483b64c691c94a8f6b26f0c3cc80b842c39f4 /devstack | |
| parent | 9de0a66aaba749daadaa97bf25637104214f23f3 (diff) | |
| parent | b2834e66619c5f968389fa6ab1cf3e5f99cbafa3 (diff) | |
| download | ironic-0450c4f2fde1567d25b63503ca6f0b5b2db25235.tar.gz | |
Merge "Allow retrying PXE boot if it takes too long"
Diffstat (limited to 'devstack')
| -rw-r--r-- | devstack/lib/ironic | 16 |
1 files changed, 13 insertions, 3 deletions
diff --git a/devstack/lib/ironic b/devstack/lib/ironic index 9da2eb744..c50a67fb2 100644 --- a/devstack/lib/ironic +++ b/devstack/lib/ironic @@ -88,9 +88,19 @@ IRONIC_USE_MOD_WSGI=$(trueorfalse $ENABLE_HTTPD_MOD_WSGI_SERVICES IRONIC_USE_MOD # Defaults to the (now confusingly named) IRONIC_USE_MOD_WSGI for backward compat IRONIC_USE_WSGI=$(trueorfalse $IRONIC_USE_MOD_WSGI IRONIC_USE_WSGI) +# Whether DevStack will be setup for bare metal or VMs +IRONIC_IS_HARDWARE=$(trueorfalse False IRONIC_IS_HARDWARE) + # Deploy callback timeout can be changed from its default (1800), if required. IRONIC_CALLBACK_TIMEOUT=${IRONIC_CALLBACK_TIMEOUT:-} +# Timeout before retrying PXE boot. Set low to help the CI. +if [[ "$IRONIC_IS_HARDWARE" == False ]]; then + IRONIC_PXE_BOOT_RETRY_TIMEOUT=${IRONIC_PXE_BOOT_RETRY_TIMEOUT:-600} +else + IRONIC_PXE_BOOT_RETRY_TIMEOUT=${IRONIC_PXE_BOOT_RETRY_TIMEOUT:-} +fi + # Ping timeout after the node becomes active IRONIC_PING_TIMEOUT=${IRONIC_PING_TIMEOUT:-} @@ -327,9 +337,6 @@ IRONIC_HTTP_PORT=${IRONIC_HTTP_PORT:-3928} IRONIC_RPC_TRANSPORT=${IRONIC_RPC_TRANSPORT:-oslo} IRONIC_JSON_RPC_PORT=${IRONIC_JSON_RPC_PORT:-8089} -# Whether DevStack will be setup for bare metal or VMs -IRONIC_IS_HARDWARE=$(trueorfalse False IRONIC_IS_HARDWARE) - # The first port in the range to bind the Virtual BMCs. The number of # ports that will be used depends on $IRONIC_VM_COUNT variable, e.g if # $IRONIC_VM_COUNT=3 the ports 6230, 6231 and 6232 will be used for the @@ -1479,6 +1486,9 @@ function configure_ironic_conductor { iniset $IRONIC_CONF_FILE pxe tftp_server $IRONIC_TFTPSERVER_IP iniset $IRONIC_CONF_FILE pxe tftp_root $IRONIC_TFTPBOOT_DIR iniset $IRONIC_CONF_FILE pxe tftp_master_path $IRONIC_TFTPBOOT_DIR/master_images + if [[ -n "$IRONIC_PXE_BOOT_RETRY_TIMEOUT" ]]; then + iniset $IRONIC_CONF_FILE pxe boot_retry_timeout $IRONIC_PXE_BOOT_RETRY_TIMEOUT + fi if [[ "$IRONIC_TERMINAL_SSL" == "True" ]]; then # Make sure the cert directory exist sudo mkdir -p $IRONIC_TERMINAL_CERT_DIR |