From b83bec14e079193a82acabf993ff5336deb61099 Mon Sep 17 00:00:00 2001
From: Clark Boylan <clark.boylan@gmail.com>
Date: Fri, 27 Mar 2015 09:32:00 -0700
Subject: [PATCH] Use gate64 cpu type during multinode testing

This relies on devstack to set up a working cpu map that
includes the gate64 cpu model.

Change-Id: I839e1c724821ba2624beddb5233eda24b50c149f
Depends-On: I00667713bfba67ab8cedbcb1660ff94d4f4bcc07
---
 devstack-vm-gate.sh | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/devstack-vm-gate.sh b/devstack-vm-gate.sh
index 75bdad50..dff89bf1 100755
--- a/devstack-vm-gate.sh
+++ b/devstack-vm-gate.sh
@@ -336,7 +336,6 @@ EOF
     fi
 
     if [[ "$DEVSTACK_GATE_TOPOLOGY" != "aio" ]]; then
-        echo "CIRROS_ARCH=i386" >> "$localrc_file"
         echo "NOVA_ALLOW_MOVE_TO_SAME_HOST=False" >> "$localrc_file"
         echo "export LIVE_MIGRATION_AVAILABLE=True" >> "$localrc_file"
         echo "export USE_BLOCK_MIGRATION_FOR_LIVE_MIGRATION=True" >> "$localrc_file"
@@ -440,7 +439,7 @@ else
 
     if [[ "$DEVSTACK_GATE_TOPOLOGY" != "aio" ]]; then
         set -x  # for now enabling debug and do not turn it off
-        echo -e "[[post-config|\$NOVA_CONF]]\n[libvirt]\ncpu_mode=custom\ncpu_model=pentiumpro" >> local.conf
+        echo -e "[[post-config|\$NOVA_CONF]]\n[libvirt]\ncpu_mode=custom\ncpu_model=gate64" >> local.conf
         setup_localrc "new" "$OVERRIDE_ZUUL_BRANCH" "sub_localrc" "sub"
         sudo mkdir -p $BASE/new/.ssh
         sudo cp /etc/nodepool/id_rsa.pub $BASE/new/.ssh/authorized_keys