From 2f991522e7fb396ab3d2191a7917be109758e9ec Mon Sep 17 00:00:00 2001
From: Julia Kreger <juliaashleykreger@gmail.com>
Date: Wed, 5 Dec 2018 10:17:23 -0800
Subject: [PATCH] Change multinode jobs to default to local boot

When validations occur, we raise an exception internally
which can lead to confusing and misleading log messages
when whole disk images are utilized with the standing
default of network booting on neutron.

We've long discussed changing it, so why not start.

Change-Id: I68bb1b9bf8c14ba686eb1c9d2755badf84481f91
---
 .../legacy/grenade-dsvm-ironic-multinode-multitenant/run.yaml   | 1 +
 zuul.d/ironic-jobs.yaml                                         | 2 ++
 2 files changed, 3 insertions(+)

diff --git a/playbooks/legacy/grenade-dsvm-ironic-multinode-multitenant/run.yaml b/playbooks/legacy/grenade-dsvm-ironic-multinode-multitenant/run.yaml
index aefb72b615..289385a26f 100644
--- a/playbooks/legacy/grenade-dsvm-ironic-multinode-multitenant/run.yaml
+++ b/playbooks/legacy/grenade-dsvm-ironic-multinode-multitenant/run.yaml
@@ -82,6 +82,7 @@
             export DEVSTACK_LOCAL_CONFIG+=$'\n'"TENANT_VLAN_RANGE=100:150"
             export DEVSTACK_LOCAL_CONFIG+=$'\n'"IRONIC_ENABLED_NETWORK_INTERFACES=flat,neutron"
             export DEVSTACK_LOCAL_CONFIG+=$'\n'"IRONIC_NETWORK_INTERFACE=neutron"
+            export DEVSTACK_LOCAL_CONFIG+=$'\n'"IRONIC_DEFAULT_BOOT_OPTION=local"
             export DEVSTACK_LOCAL_CONFIG+=$'\n'"IRONIC_AUTOMATED_CLEAN_ENABLED=False"
 
             export DEVSTACK_LOCAL_CONFIG+=$'\n'"IRONIC_VM_SPECS_RAM=384"
diff --git a/zuul.d/ironic-jobs.yaml b/zuul.d/ironic-jobs.yaml
index 76b140ead3..b29ba5bfce 100644
--- a/zuul.d/ironic-jobs.yaml
+++ b/zuul.d/ironic-jobs.yaml
@@ -365,6 +365,7 @@
         IRONIC_BUILD_DEPLOY_RAMDISK: False
         IRONIC_CALLBACK_TIMEOUT: 600
         IRONIC_DEFAULT_DEPLOY_INTERFACE: direct
+        IRONIC_DEFAULT_BOOT_OPTION: local
         IRONIC_DEPLOY_DRIVER: ipmi
         IRONIC_ENABLED_NETWORK_INTERFACES: flat,neutron
         IRONIC_INSPECTOR_BUILD_RAMDISK: False
@@ -441,6 +442,7 @@
           IRONIC_AUTOMATED_CLEAN_ENABLED: False
           IRONIC_BAREMETAL_BASIC_OPS: True
           IRONIC_DEPLOY_DRIVER: ipmi
+          IRONIC_DEFAULT_BOOT_OPTION: local
           IRONIC_ENABLED_NETWORK_INTERFACES: flat,neutron
           IRONIC_NETWORK_INTERFACE: neutron
           IRONIC_PROVISION_NETWORK_NAME: ironic-provision