Merge "Support default_boot_mode and prepare the CI for different boot modes"

playbooks/ci/run.yaml

@@ -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('') }}"

playbooks/roles/bifrost-ironic-install/defaults/main.yml

@@ -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

playbooks/roles/bifrost-ironic-install/templates/ironic.conf.j2

@@ -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

releasenotes/notes/default-boot-mode-5561325f68224719.yaml

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

scripts/test-bifrost.sh

@@ -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() {