From fed2cbfa9d01422bc71fa7877c5badf7c92ea975 Mon Sep 17 00:00:00 2001 From: Julia Kreger Date: Wed, 1 Apr 2020 07:40:03 -0700 Subject: [PATCH] Set default boot option to netboot for jobs using cirros An upcoming ironic change changes the default boot option for nodes to local booting as opposed to the long standing default netboot. Some jobs still use cirros, which cannot be local booted from a partition image as it is designed to write the ramdisk contents to the partition upon the initial network boot. Change-Id: I0d0c043de449048c3cc38ed7d7dac3e9e85974ef --- playbooks/legacy/ironic-inspector-grenade-dsvm/run.yaml | 1 + zuul.d/ironic-inspector-jobs.yaml | 2 ++ 2 files changed, 3 insertions(+) diff --git a/playbooks/legacy/ironic-inspector-grenade-dsvm/run.yaml b/playbooks/legacy/ironic-inspector-grenade-dsvm/run.yaml index 5c504c6ed..a90f51b76 100644 --- a/playbooks/legacy/ironic-inspector-grenade-dsvm/run.yaml +++ b/playbooks/legacy/ironic-inspector-grenade-dsvm/run.yaml @@ -105,6 +105,7 @@ export DEVSTACK_GATE_CONFIGDRIVE=1 export DEVSTACK_GATE_IRONIC_DRIVER=ipmi export DEVSTACK_LOCAL_CONFIG+=$'\n'"IRONIC_DEFAULT_DEPLOY_INTERFACE=iscsi" + export DEVSTACK_LOCAL_CONFIG+=$'\n'"IRONIC_DEFAULT_BOOT_OPTION=netboot" export BRANCH_OVERRIDE="{{ zuul.override_checkout | default('default') }}" if [ "$BRANCH_OVERRIDE" != "default" ] ; then diff --git a/zuul.d/ironic-inspector-jobs.yaml b/zuul.d/ironic-inspector-jobs.yaml index 30dc1534a..f2e2beda5 100644 --- a/zuul.d/ironic-inspector-jobs.yaml +++ b/zuul.d/ironic-inspector-jobs.yaml @@ -47,6 +47,7 @@ parent: ironic-inspector-base vars: devstack_localrc: + IRONIC_DEFAULT_BOOT_OPTION: netboot IRONIC_INSPECTOR_STANDALONE: False devstack_services: s-account: True @@ -79,6 +80,7 @@ parent: ironic-inspector-base vars: devstack_localrc: + IRONIC_DEFAULT_BOOT_OPTION: netboot IRONIC_INSPECTOR_MANAGED_BOOT: True IRONIC_INSPECTOR_NODE_NOT_FOUND_HOOK: ''