openstack/devstack-gate
Code Issues Proposed changes

Merge "Do not use *_ssh ironic drivers by default"

Browse Source
This commit is contained in:
Jenkins 2017-07-28 14:29:10 +00:00 committed by Gerrit Code Review
commit 94602b3cd5
2 changed files with 5 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -230,8 +230,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 "agent_ipmitool" to run ironic with the ironic-python-agent driver
export DEVSTACK_GATE_IRONIC_DRIVER=${DEVSTACK_GATE_IRONIC_DRIVER:-pxe_ipmitool}
# Set to 0 to avoid building Ironic deploy ramdisks
export DEVSTACK_GATE_IRONIC_BUILD_RAMDISK=${DEVSTACK_GATE_IRONIC_BUILD_RAMDISK:-1}

4
devstack-vm-gate.sh
View File

@ -447,13 +447,13 @@ function setup_localrc {
if [[ -z "${DEVSTACK_GATE_IRONIC_DRIVER%%agent*}" ]]; then
localrc_set "$localrc_file" "SWIFT_ENABLE_TEMPURLS" "True"
localrc_set "$localrc_file" "SWIFT_TEMPURL_KEY" "secretkey"
localrc_set "$localrc_file" "IRONIC_ENABLED_DRIVERS" "fake,agent_ssh,agent_ipmitool"
localrc_set "$localrc_file" "IRONIC_ENABLED_DRIVERS" "fake,agent_ipmitool"
# agent driver doesn't support ephemeral volumes yet
localrc_set "$localrc_file" "IRONIC_VM_EPHEMERAL_DISK" "0"
# agent CoreOS ramdisk is a little heavy
localrc_set "$localrc_file" "IRONIC_VM_SPECS_RAM" "1024"
else
localrc_set "$localrc_file" "IRONIC_ENABLED_DRIVERS" "fake,pxe_ssh,pxe_ipmitool"
localrc_set "$localrc_file" "IRONIC_ENABLED_DRIVERS" "fake,pxe_ipmitool"
localrc_set "$localrc_file" "IRONIC_VM_EPHEMERAL_DISK" "1"
fi
fi