diff options
| author | Zuul <zuul@review.opendev.org> | 2021-10-07 10:04:24 +0000 |
|---|---|---|
| committer | Gerrit Code Review <review@openstack.org> | 2021-10-07 10:04:24 +0000 |
| commit | af903094ea6874a00751bd5f41da0b577f81705a (patch) | |
| tree | 8c307833f21bf34cb5ce007b4dede673f7337476 /devstack | |
| parent | e082a11174e69f0a731c1319f9dfd551b18ae85e (diff) | |
| parent | 493b4f0caf591caeaa3285c7f597a54121d99985 (diff) | |
| download | ironic-af903094ea6874a00751bd5f41da0b577f81705a.tar.gz | |
Merge "Yoga: Change default boot mode to uefi"
Diffstat (limited to 'devstack')
| -rw-r--r-- | devstack/common_settings | 4 | ||||
| -rw-r--r-- | devstack/lib/ironic | 7 |
2 files changed, 8 insertions, 3 deletions
diff --git a/devstack/common_settings b/devstack/common_settings index d649f70a5..8d5660c4d 100644 --- a/devstack/common_settings +++ b/devstack/common_settings @@ -5,8 +5,8 @@ if [[ -f $TOP_DIR/../../old/devstack/.localrc.auto ]]; then fi # Whether configure the nodes to boot in Legacy BIOS or UEFI mode. Accepted -# values are: "bios" or "uefi", defaults to "bios". -IRONIC_BOOT_MODE=${IRONIC_BOOT_MODE:-bios} +# values are: "bios" or "uefi", defaults to "uefi". +IRONIC_BOOT_MODE=${IRONIC_BOOT_MODE:-uefi} CIRROS_VERSION_DEVSTACK=$(set +o xtrace && source $TOP_DIR/stackrc && diff --git a/devstack/lib/ironic b/devstack/lib/ironic index 5aec60a15..5fa1db08f 100644 --- a/devstack/lib/ironic +++ b/devstack/lib/ironic @@ -2371,6 +2371,9 @@ function enroll_nodes { if [[ "$IRONIC_BOOT_MODE" == "uefi" ]]; then node_capabilities+=" --property capabilities=boot_mode:uefi" fi + if [[ "$IRONIC_BOOT_MODE" == "bios" ]]; then + node_capabilities+=" --property capabilities=boot_mode:bios" + fi if [[ "$IRONIC_SECURE_BOOT" == "True" ]]; then if [[ -n "$node_capabilities" ]]; then node_capabilities+=",secure_boot:true" @@ -2581,7 +2584,9 @@ function enroll_nodes { if [[ "$IRONIC_BOOT_MODE" == "uefi" ]]; then openstack --os-cloud $OS_CLOUD flavor set baremetal --property "capabilities:boot_mode"="uefi" fi - + if [[ "$IRONIC_BOOT_MODE" == "bios" ]]; then + openstack --os-cloud $OS_CLOUD flavor set baremetal --property "capabilities:boot_mode"="bios" + fi for trait in $IRONIC_DEFAULT_TRAITS; do openstack --os-cloud $OS_CLOUD flavor set baremetal --property "trait:$trait"="required" done |