Support default_boot_mode and prepare the CI for different boot modes

Change-Id: I0c56824aa0041f24d4ca172b590c8504cef3d9c4
This commit is contained in:
Dmitry Tantsur 2020-08-04 12:52:49 +02:00
parent 66777bf949
commit 9f62bc9a33
5 changed files with 17 additions and 1 deletions

View File

@ -13,3 +13,4 @@
USE_DHCP: "{{ use_dhcp | default(false) | bool | lower }}"
ENABLE_VENV: "{{ use_venv | default(true) | bool | lower }}"
ZUUL_BRANCH: "{{ zuul.branch }}"
BOOT_MODE: "{{ boot_mode | default('') }}"

View File

@ -136,6 +136,8 @@ enabled_power_interfaces: ""
default_resource_class: baremetal
default_boot_mode: ""
enable_credential_less_deploy: false
# Extra pip packages to install with ironic

View File

@ -68,6 +68,9 @@ enable_netboot_fallback = true
http_url = http://{{ internal_ip }}:{{ file_url_port }}/
http_root = {{ http_boot_folder }}
default_boot_option = local
{% if default_boot_mode | default('') != '' %}
default_boot_mode = {{ default_boot_mode }}
{% endif %}
fast_track = {{ fast_track }}
{% if cleaning_disk_erase | bool %}
erase_devices_priority = 10

View File

@ -0,0 +1,5 @@
---
features:
- |
The new parameter ``default_boot_mode`` allows specifying the default boot
mode: ``uefi`` or ``bios``.

View File

@ -13,6 +13,7 @@ ENABLE_KEYSTONE="${ENABLE_KEYSTONE:-false}"
ZUUL_BRANCH=${ZUUL_BRANCH:-}
ENABLE_VENV=true
CLI_TEST=${CLI_TEST:-false}
BOOT_MODE=${BOOT_MODE:-}
# Set defaults for ansible command-line options to drive the different
# tests.
@ -97,7 +98,11 @@ elif [ ${BUILD_IMAGE} = "true" ]; then
fi
elif [ ${ENABLE_KEYSTONE} = "true" ]; then
NOAUTH_MODE=false
CLOUD_CONFIG="-e cloud_name=bifrost"
CLOUD_CONFIG+=" -e cloud_name=bifrost"
fi
if [[ -n "$BOOT_MODE" ]]; then
CLOUD_CONFIG+=" -e default_boot_mode=$BOOT_MODE"
fi
logs_on_exit() {