openstack/devstack-gate
Code Issues Proposed changes

Merge "Add Ironic-python-agent support to devstack-gate"

Browse Source
This commit is contained in:
Jenkins
2014-08-28 05:39:36 +00:00
committed by Gerrit Code Review
parent a7009df479 0011d25d03
commit 736454b5b4
2 changed files with 9 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
devstack-vm-gate-wrap.sh
View File

@@ -183,6 +183,9 @@ export DEVSTACK_GATE_NOVA_API_METADATA_SPLIT=${DEVSTACK_GATE_NOVA_API_METADATA_S
# Set to 1 to run ironic baremetal provisioning service.
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 1 to run sahara
export DEVSTACK_GATE_SAHARA=${DEVSTACK_GATE_SAHARA:-0}

6
devstack-vm-gate.sh
View File

@@ -126,6 +126,12 @@ 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_DRIVER" == "agent_ssh" ]]; then
echo "SWIFT_ENABLE_TEMPURLS=True" >>localrc
echo "IRONIC_ENABLED_DRIVERS=fake,agent_ssh,agent_ipmitool" >>localrc
echo "IRONIC_BUILD_DEPLOY_RAMDISK=False" >>localrc
echo "IRONIC_DEPLOY_DRIVER=agent_ssh" >>localrc
fi
fi
if [[ "$DEVSTACK_GATE_VIRT_DRIVER" == "xenapi" ]]; then