diff options
| author | Zuul <zuul@review.opendev.org> | 2021-07-28 04:34:04 +0000 |
|---|---|---|
| committer | Gerrit Code Review <review@openstack.org> | 2021-07-28 04:34:04 +0000 |
| commit | 1bdee995837c2511e1513cc0f5ac24a0d60963e8 (patch) | |
| tree | 0168dd81a097025e546099ec1151ce98dcb63bd3 /devstack/lib/ironic | |
| parent | 0db9bc6000b1a44167df87c4b917669cc0c80d18 (diff) | |
| parent | a5fc6cc2cba367ee941b1d810707e371083c7ebc (diff) | |
| download | ironic-1bdee995837c2511e1513cc0f5ac24a0d60963e8.tar.gz | |
Merge "Provide a path to set explicit ipxe bootloaders" into stable/train
Diffstat (limited to 'devstack/lib/ironic')
| -rw-r--r-- | devstack/lib/ironic | 6 |
1 files changed, 2 insertions, 4 deletions
diff --git a/devstack/lib/ironic b/devstack/lib/ironic index cc3f49bad..fea0ff61c 100644 --- a/devstack/lib/ironic +++ b/devstack/lib/ironic @@ -1548,10 +1548,8 @@ function configure_ironic_conductor { pxebin=`basename $IRONIC_PXE_BOOT_IMAGE` uefipxebin=`basename $(get_uefi_ipxe_boot_file)` iniset $IRONIC_CONF_FILE pxe ipxe_enabled True - iniset $IRONIC_CONF_FILE pxe pxe_config_template '$pybasedir/drivers/modules/ipxe_config.template' - iniset $IRONIC_CONF_FILE pxe pxe_bootfile_name $pxebin - iniset $IRONIC_CONF_FILE pxe uefi_pxe_config_template '$pybasedir/drivers/modules/ipxe_config.template' - iniset $IRONIC_CONF_FILE pxe uefi_pxe_bootfile_name $uefipxebin + iniset $IRONIC_CONF_FILE pxe ipxe_bootfile_name $pxebin + iniset $IRONIC_CONF_FILE pxe uefi_ipxe_bootfile_name $uefipxebin iniset $IRONIC_CONF_FILE deploy http_root $IRONIC_HTTP_DIR iniset $IRONIC_CONF_FILE deploy http_url "http://$IRONIC_HTTP_SERVER:$IRONIC_HTTP_PORT" if [[ "$IRONIC_IPXE_USE_SWIFT" == "True" ]]; then |