Merge "Add option for building Ironic deploy ramdisks"

This commit is contained in:
Jenkins
2014-09-12 19:09:35 +00:00
committed by Gerrit Code Review
2 changed files with 6 additions and 0 deletions

View File

@@ -189,6 +189,9 @@ export DEVSTACK_GATE_IRONIC=${DEVSTACK_GATE_IRONIC:-0}
# Set to "agent_ssh" to run ironic with the ironic-python-agent driver
export DEVSTACK_GATE_IRONIC_DRIVER=${DEVSTACK_GATE_IRONIC_DRIVER:-pxe_ssh}
# Set to 0 to avoid building Ironic deploy ramdisks
export DEVSTACK_GATE_IRONIC_BUILD_RAMDISK=${DEVSTACK_GATE_IRONIC_BUILD_RAMDISK:-1}
# Set to 1 to run sahara
export DEVSTACK_GATE_SAHARA=${DEVSTACK_GATE_SAHARA:-0}

View File

@@ -126,6 +126,9 @@ EOF
echo "IRONIC_VM_EPHEMERAL_DISK=1" >>localrc
echo "IRONIC_VM_LOG_DIR=$BASE/$LOCALRC_OLDNEW/ironic-bm-logs" >>localrc
echo "DEFAULT_INSTANCE_TYPE=baremetal" >>localrc
if [[ "$DEVSTACK_GATE_IRONIC_BUILD_RAMDISK" -eq 0 ]]; then
echo "IRONIC_BUILD_DEPLOY_RAMDISK=False" >>localrc
fi
if [[ "$DEVSTACK_GATE_IRONIC_DRIVER" == "agent_ssh" ]]; then
echo "SWIFT_ENABLE_TEMPURLS=True" >>localrc
echo "IRONIC_ENABLED_DRIVERS=fake,agent_ssh,agent_ipmitool" >>localrc