From 90d241a1e24bfd3d97998c0d139e0aeb9a2655fa Mon Sep 17 00:00:00 2001 From: Adam Gandelman Date: Mon, 25 Aug 2014 18:01:54 -0700 Subject: [PATCH] Set required devstack variables for Ironic+grenade When sideways migrating from the fake nova driver, do not attempt to exercise the base side of Grenade using Tempest and Javelin. Also, bump the number of VMs enrolled in the Ironic inventory to 3 to facilitate Tempest concurrency. Change-Id: I0dc1c1576ff3ff53d1de76af35e6a6f0e2738ac3 --- devstack-vm-gate.sh | 12 ++++++++++++ 1 file changed, 12 insertions(+) diff --git a/devstack-vm-gate.sh b/devstack-vm-gate.sh index da429d59..2bdb2a74 100755 --- a/devstack-vm-gate.sh +++ b/devstack-vm-gate.sh @@ -123,6 +123,7 @@ EOF if [[ "$DEVSTACK_GATE_VIRT_DRIVER" == "ironic" ]]; then 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 @@ -200,6 +201,9 @@ EOF else echo "GRENADE_PHASE=target" >> localrc fi + # keystone deployed with mod wsgi cannot be upgraded or migrated + # until https://launchpad.net/bugs/1365105 is resolved. + echo "KEYSTONE_USE_MOD_WSGI=False" >> localrc else # Grenade needs screen, so only turn this off if we aren't # running grenade. @@ -296,6 +300,14 @@ DO_NOT_UPGRADE_SERVICES=$DO_NOT_UPGRADE_SERVICES TEMPEST_CONCURRENCY=$TEMPEST_CONCURRENCY VERBOSE=False EOF + + if [[ "$DEVSTACK_GATE_GRENADE" == "sideways-ironic" ]]; then + # sideways-ironic migrates from a fake environment, avoid exercising + # base. + echo "BASE_RUN_SMOKE=False" >> $BASE/new/grenade/localrc + echo "RUN_JAVELIN=False" >> $BASE/new/grenade/localrc + fi + # Make the workspace owned by the stack user sudo chown -R stack:stack $BASE