From 2940568351245dd606ab89e74847d2f9bc75c1ec Mon Sep 17 00:00:00 2001 From: Jim Rollenhagen Date: Thu, 11 Sep 2014 08:38:23 -0700 Subject: [PATCH] Don't use ephemeral volumes for Ironic agent driver The agent driver (unfortunately) does not support ephemeral volumes yet. This change sets ephemeral volume size to 0, which is checked by Tempest when testing ephemeral support. See also: https://review.openstack.org/#/c/120814/ Change-Id: Iafac1521ff47f881934c4c6e03818486ca574cb8 --- devstack-vm-gate.sh | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/devstack-vm-gate.sh b/devstack-vm-gate.sh index 01a4f91d..6185c7d9 100755 --- a/devstack-vm-gate.sh +++ b/devstack-vm-gate.sh @@ -124,7 +124,6 @@ EOF echo "VIRT_DRIVER=ironic" >>localrc echo "IRONIC_BAREMETAL_BASIC_OPS=True" >>localrc echo "IRONIC_VM_COUNT=3" >>localrc - 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 @@ -135,6 +134,10 @@ EOF echo "IRONIC_ENABLED_DRIVERS=fake,agent_ssh,agent_ipmitool" >>localrc echo "IRONIC_BUILD_DEPLOY_RAMDISK=False" >>localrc echo "IRONIC_DEPLOY_DRIVER=agent_ssh" >>localrc + # agent driver doesn't support ephemeral volumes yet + echo "IRONIC_VM_EPHEMERAL_DISK=0" >>localrc + else + echo "IRONIC_VM_EPHEMERAL_DISK=1" >>localrc fi fi