From 697048b47edc8b70bb602485714997b0f6b3d0f4 Mon Sep 17 00:00:00 2001 From: Kaifeng Wang Date: Tue, 10 Dec 2019 14:21:35 +0800 Subject: [PATCH] Explicitly use ipxe as boot interface for iPXE testing We are about to drop pxe + ipxe_enabled=True combination for iPXE testing, so let's make it explicit in the jobs. Change-Id: I0e99e6336aa47857c06ba2f6869e66580159a9be Story: 2007003 Task: 37779 --- devstack/lib/ironic | 2 +- zuul.d/ironic-jobs.yaml | 1 + 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/devstack/lib/ironic b/devstack/lib/ironic index a9e516fe7e..570d60435a 100644 --- a/devstack/lib/ironic +++ b/devstack/lib/ironic @@ -173,7 +173,7 @@ IRONIC_ENABLED_HARDWARE_TYPES=${IRONIC_ENABLED_HARDWARE_TYPES:-"ipmi,fake-hardwa # list of all available driver interfaces types IRONIC_DRIVER_INTERFACE_TYPES="bios boot power management deploy console inspect raid rescue storage network vendor" IRONIC_ENABLED_BIOS_INTERFACES=${IRONIC_ENABLED_BIOS_INTERFACES:-"fake,no-bios"} -IRONIC_ENABLED_BOOT_INTERFACES=${IRONIC_ENABLED_BOOT_INTERFACES:-"fake,pxe"} +IRONIC_ENABLED_BOOT_INTERFACES=${IRONIC_ENABLED_BOOT_INTERFACES:-"fake,ipxe"} IRONIC_ENABLED_CONSOLE_INTERFACES=${IRONIC_ENABLED_CONSOLE_INTERFACES:-"fake,no-console"} IRONIC_ENABLED_DEPLOY_INTERFACES=${IRONIC_ENABLED_DEPLOY_INTERFACES:-"fake,iscsi,direct"} IRONIC_ENABLED_INSPECT_INTERFACES=${IRONIC_ENABLED_INSPECT_INTERFACES:-"fake,no-inspect"} diff --git a/zuul.d/ironic-jobs.yaml b/zuul.d/ironic-jobs.yaml index 90b640153b..7b80eac85d 100644 --- a/zuul.d/ironic-jobs.yaml +++ b/zuul.d/ironic-jobs.yaml @@ -151,6 +151,7 @@ parent: ironic-base vars: devstack_localrc: + IRONIC_ENABLED_BOOT_INTERFACES: "fake,pxe" IRONIC_IPXE_ENABLED: False devstack_services: mysql: False