Merge "Change multinode jobs to default to local boot"
This commit is contained in:
commit
5e0496ceb3
@ -81,6 +81,7 @@
|
|||||||
export DEVSTACK_LOCAL_CONFIG+=$'\n'"TENANT_VLAN_RANGE=100:150"
|
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_ENABLED_NETWORK_INTERFACES=flat,neutron"
|
||||||
export DEVSTACK_LOCAL_CONFIG+=$'\n'"IRONIC_NETWORK_INTERFACE=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_AUTOMATED_CLEAN_ENABLED=False"
|
||||||
export DEVSTACK_LOCAL_CONFIG+=$'\n'"IRONIC_VM_SPECS_RAM=384"
|
export DEVSTACK_LOCAL_CONFIG+=$'\n'"IRONIC_VM_SPECS_RAM=384"
|
||||||
export DEVSTACK_LOCAL_CONFIG+=$'\n'"IRONIC_RAMDISK_TYPE=tinyipa"
|
export DEVSTACK_LOCAL_CONFIG+=$'\n'"IRONIC_RAMDISK_TYPE=tinyipa"
|
||||||
|
@ -365,6 +365,7 @@
|
|||||||
IRONIC_BUILD_DEPLOY_RAMDISK: False
|
IRONIC_BUILD_DEPLOY_RAMDISK: False
|
||||||
IRONIC_CALLBACK_TIMEOUT: 600
|
IRONIC_CALLBACK_TIMEOUT: 600
|
||||||
IRONIC_DEFAULT_DEPLOY_INTERFACE: direct
|
IRONIC_DEFAULT_DEPLOY_INTERFACE: direct
|
||||||
|
IRONIC_DEFAULT_BOOT_OPTION: local
|
||||||
IRONIC_DEPLOY_DRIVER: ipmi
|
IRONIC_DEPLOY_DRIVER: ipmi
|
||||||
IRONIC_ENABLED_NETWORK_INTERFACES: flat,neutron
|
IRONIC_ENABLED_NETWORK_INTERFACES: flat,neutron
|
||||||
IRONIC_INSPECTOR_BUILD_RAMDISK: False
|
IRONIC_INSPECTOR_BUILD_RAMDISK: False
|
||||||
@ -441,6 +442,7 @@
|
|||||||
IRONIC_AUTOMATED_CLEAN_ENABLED: False
|
IRONIC_AUTOMATED_CLEAN_ENABLED: False
|
||||||
IRONIC_BAREMETAL_BASIC_OPS: True
|
IRONIC_BAREMETAL_BASIC_OPS: True
|
||||||
IRONIC_DEPLOY_DRIVER: ipmi
|
IRONIC_DEPLOY_DRIVER: ipmi
|
||||||
|
IRONIC_DEFAULT_BOOT_OPTION: local
|
||||||
IRONIC_ENABLED_NETWORK_INTERFACES: flat,neutron
|
IRONIC_ENABLED_NETWORK_INTERFACES: flat,neutron
|
||||||
IRONIC_NETWORK_INTERFACE: neutron
|
IRONIC_NETWORK_INTERFACE: neutron
|
||||||
IRONIC_PROVISION_NETWORK_NAME: ironic-provision
|
IRONIC_PROVISION_NETWORK_NAME: ironic-provision
|
||||||
|
Loading…
Reference in New Issue
Block a user