From b35baf61e48a1d2aff88e7c3e100aa996422d849 Mon Sep 17 00:00:00 2001
From: Alex Yang <yangyang1@zte.com.cn>
Date: Sat, 29 Jul 2017 20:29:52 +0800
Subject: Correct the mapping of nodes and roles in virtual deploy

JIRA: DAISY-56

Now the roles are assigned to nodes randomly, because the function
'add_hosts_interface' in tempest.py just uses zip to map the
host's name to the host.

libvirt_utils.py: get mac addresses from VM
environment.py: save the mac addresses
daisy_server.py: write a new deploy.yml which contains the mac addresses
    and copy the file to daisy server
get_conf.py: get mac addresses from the new deploy.yml
tempest.py: assigned roles to nodes when the mac addresses matched
controller.xml: increase the RAM to make difference with computer nodes
deploy.sh: apply this change to bash script

Change-Id: Ia61b60d39d319c5d01e3505727fafc63a0585858
Signed-off-by: Alex Yang <yangyang1@zte.com.cn>
---
 templates/virtual_environment/vms/controller.xml | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

(limited to 'templates/virtual_environment/vms')

diff --git a/templates/virtual_environment/vms/controller.xml b/templates/virtual_environment/vms/controller.xml
index 22a98f51..72d255e6 100644
--- a/templates/virtual_environment/vms/controller.xml
+++ b/templates/virtual_environment/vms/controller.xml
@@ -1,7 +1,7 @@
 <domain type='kvm' id='4'>
   <name>controller</name>
-  <memory unit='KiB'>8388608</memory>
-  <currentMemory unit='KiB'>8388608</currentMemory>
+  <memory unit='KiB'>12582912</memory>
+  <currentMemory unit='KiB'>12582912</currentMemory>
   <vcpu placement='static'>4</vcpu>
   <resource>
     <partition>/machine</partition>
-- 
cgit 1.2.3-korg