Merge "Set default boot option to netboot for jobs using cirros"
This commit is contained in:
commit
14b425ebe2
|
@ -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
|
||||
|
|
|
@ -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: ''
|
||||
|
||||
|
|
Loading…
Reference in New Issue