From 95e375809b107eca88f55453a98b86df9ec90cc9 Mon Sep 17 00:00:00 2001
From: Joe Gordon <joe.gordon0@gmail.com>
Date: Mon, 17 Nov 2014 10:19:33 -0800
Subject: [PATCH] Turn off nova_allow_move_to_same_host if in aiopcpu

nova's allow_resize_to_same_host and allow_migrate_to_same_host are off
by default and we only turn them on for aio devstack testing, so turn
them back off if we are not doing all in one testing and have two
nova-computes running.

Related devstack patch: If6989200b56c4597d6e8506d0dda2cc75d0881f1

Change-Id: I3afa113f731687be7bacf924e7f26a0635f95d46
---
 devstack-vm-gate.sh | 1 +
 1 file changed, 1 insertion(+)

diff --git a/devstack-vm-gate.sh b/devstack-vm-gate.sh
index 16730638..61e8c646 100755
--- a/devstack-vm-gate.sh
+++ b/devstack-vm-gate.sh
@@ -299,6 +299,7 @@ EOF
     fi
 
     if [[ "$DEVSTACK_GATE_TOPOLOGY" != "aio" ]]; then
+        echo "NOVA_ALLOW_MOVE_TO_SAME_HOST=False" >> "$localrc_file"
         local primary_node=`cat /etc/nodepool/primary_node_private`
         echo "SERVICE_HOST=$primary_node" >>"$localrc_file"
     fi