From 24e32399eba20d6b613b654b60b1dcc48a857adc Mon Sep 17 00:00:00 2001
From: Alex Yang <yangyang1@zte.com.cn>
Date: Fri, 19 May 2017 09:19:17 +0800
Subject: Use unified vm template files in python deploy script

Change-Id: I386011a35a9be3e4f1d468744a6945360bb2adb3
Signed-off-by: Alex Yang <yangyang1@zte.com.cn>
---
 deploy/config/schemas.py                             | 3 ++-
 deploy/config/vm_environment/zte-virtual1/deploy.yml | 1 +
 deploy/config/vm_environment/zte-virtual2/deploy.yml | 5 +++++
 3 files changed, 8 insertions(+), 1 deletion(-)

(limited to 'deploy/config')

diff --git a/deploy/config/schemas.py b/deploy/config/schemas.py
index 7cc2c80e..d2fd7ef6 100644
--- a/deploy/config/schemas.py
+++ b/deploy/config/schemas.py
@@ -27,7 +27,8 @@ hosts_schema = {
                     'type': 'string',
                     'enum': ['COMPUTER', 'CONTROLLER_LB', 'CONTROLLER_HA']
                 }
-            }
+            },
+            'template': {'type': 'string', 'minLength': 1}
         }
     }
 }
diff --git a/deploy/config/vm_environment/zte-virtual1/deploy.yml b/deploy/config/vm_environment/zte-virtual1/deploy.yml
index 0b3a2c52..a85f429f 100644
--- a/deploy/config/vm_environment/zte-virtual1/deploy.yml
+++ b/deploy/config/vm_environment/zte-virtual1/deploy.yml
@@ -4,6 +4,7 @@ hosts:
   roles:
     - 'CONTROLLER_LB'
     - 'COMPUTER'
+  template: 'templates/virtual_environment/vms/all_in_one.xml'
 disks:
   daisy: 50
   controller: 110
diff --git a/deploy/config/vm_environment/zte-virtual2/deploy.yml b/deploy/config/vm_environment/zte-virtual2/deploy.yml
index 646fa130..43b2ed03 100644
--- a/deploy/config/vm_environment/zte-virtual2/deploy.yml
+++ b/deploy/config/vm_environment/zte-virtual2/deploy.yml
@@ -3,18 +3,23 @@ hosts:
 - name: 'controller01'
   roles:
     - 'CONTROLLER_LB'
+  template: 'templates/virtual_environment/vms/controller.xml'
 - name: 'controller02'
   roles:
     - 'CONTROLLER_LB'
+  template: 'templates/virtual_environment/vms/controller.xml'
 - name: 'controller03'
   roles:
     - 'CONTROLLER_LB'
+  template: 'templates/virtual_environment/vms/controller.xml'
 - name: 'computer01'
   roles:
     - 'COMPUTER'
+  template: 'templates/virtual_environment/vms/computer.xml'
 - name: 'computer02'
   roles:
     - 'COMPUTER'
+  template: 'templates/virtual_environment/vms/computer.xml'
 disks:
   daisy: 50
   controller: 110
-- 
cgit 1.2.3-korg