From 77f085712a8a7ab2cb42411f457ee87675cdf676 Mon Sep 17 00:00:00 2001
From: root <zhou.ya@zte.com.cn>
Date: Thu, 6 Jul 2017 10:42:50 +0800
Subject: add extra interface to enable the keepablived plane and the api plane

Change-Id: I0157bf8b6fa9be254c61bb384065f80107ab3dda
Signed-off-by: root <zhou.ya@zte.com.cn>
---
 templates/virtual_environment/networks/external.xml      | 12 ++++++++++++
 templates/virtual_environment/networks/keepalived.xml    | 12 ++++++++++++
 templates/virtual_environment/networks/os-all_in_one.xml | 12 ------------
 templates/virtual_environment/vms/computer01.xml         |  4 ++++
 templates/virtual_environment/vms/computer02.xml         |  4 ++++
 templates/virtual_environment/vms/controller01.xml       |  4 ++++
 templates/virtual_environment/vms/controller02.xml       |  4 ++++
 templates/virtual_environment/vms/controller03.xml       |  4 ++++
 8 files changed, 44 insertions(+), 12 deletions(-)
 create mode 100644 templates/virtual_environment/networks/external.xml
 create mode 100644 templates/virtual_environment/networks/keepalived.xml
 delete mode 100644 templates/virtual_environment/networks/os-all_in_one.xml

(limited to 'templates')

diff --git a/templates/virtual_environment/networks/external.xml b/templates/virtual_environment/networks/external.xml
new file mode 100644
index 00000000..f8e86830
--- /dev/null
+++ b/templates/virtual_environment/networks/external.xml
@@ -0,0 +1,12 @@
+<network connections='1'>
+  <name>daisy2</name>
+  <forward mode='nat'>
+    <nat>
+      <port start='1024' end='65535'/>
+    </nat>
+  </forward>
+  <bridge name='daisy2' stp='on' delay='0'/>
+  <domain name='daisy2'/>
+  <ip address='172.10.101.1' netmask='255.255.255.0'>
+  </ip>
+</network>
diff --git a/templates/virtual_environment/networks/keepalived.xml b/templates/virtual_environment/networks/keepalived.xml
new file mode 100644
index 00000000..7f13a1c6
--- /dev/null
+++ b/templates/virtual_environment/networks/keepalived.xml
@@ -0,0 +1,12 @@
+<network connections='1'>
+  <name>daisy3</name>
+  <forward mode='nat'>
+    <nat>
+      <port start='1024' end='65535'/>
+    </nat>
+  </forward>
+  <bridge name='daisy3' stp='on' delay='0'/>
+  <domain name='daisy3'/>
+  <ip address='100.20.11.1' netmask='255.255.255.0'>
+  </ip>
+</network>
diff --git a/templates/virtual_environment/networks/os-all_in_one.xml b/templates/virtual_environment/networks/os-all_in_one.xml
deleted file mode 100644
index f8e86830..00000000
--- a/templates/virtual_environment/networks/os-all_in_one.xml
+++ /dev/null
@@ -1,12 +0,0 @@
-<network connections='1'>
-  <name>daisy2</name>
-  <forward mode='nat'>
-    <nat>
-      <port start='1024' end='65535'/>
-    </nat>
-  </forward>
-  <bridge name='daisy2' stp='on' delay='0'/>
-  <domain name='daisy2'/>
-  <ip address='172.10.101.1' netmask='255.255.255.0'>
-  </ip>
-</network>
diff --git a/templates/virtual_environment/vms/computer01.xml b/templates/virtual_environment/vms/computer01.xml
index 66c54eb7..5f7f88ba 100644
--- a/templates/virtual_environment/vms/computer01.xml
+++ b/templates/virtual_environment/vms/computer01.xml
@@ -84,6 +84,10 @@
       <source network='daisy2' bridge='daisy2'/>
       <model type='rtl8139'/>
     </interface>
+    <interface type='network'>
+      <source network='daisy3' bridge='daisy3'/>
+      <model type='rtl8139'/>
+    </interface>
     <serial type='pty'>
       <source path='/dev/pts/4'/>
       <target port='0'/>
diff --git a/templates/virtual_environment/vms/computer02.xml b/templates/virtual_environment/vms/computer02.xml
index f176a1e4..bad307cf 100644
--- a/templates/virtual_environment/vms/computer02.xml
+++ b/templates/virtual_environment/vms/computer02.xml
@@ -84,6 +84,10 @@
       <source network='daisy2' bridge='daisy2'/>
       <model type='rtl8139'/>
     </interface>
+    <interface type='network'>
+      <source network='daisy3' bridge='daisy3'/>
+      <model type='rtl8139'/>
+    </interface>
     <serial type='pty'>
       <source path='/dev/pts/4'/>
       <target port='0'/>
diff --git a/templates/virtual_environment/vms/controller01.xml b/templates/virtual_environment/vms/controller01.xml
index c432c310..e2919996 100644
--- a/templates/virtual_environment/vms/controller01.xml
+++ b/templates/virtual_environment/vms/controller01.xml
@@ -84,6 +84,10 @@
       <source network='daisy2' bridge='daisy2'/>
       <model type='rtl8139'/>
     </interface>
+    <interface type='network'>
+      <source network='daisy3' bridge='daisy3'/>
+      <model type='rtl8139'/>
+    </interface>
     <serial type='pty'>
       <source path='/dev/pts/4'/>
       <target port='0'/>
diff --git a/templates/virtual_environment/vms/controller02.xml b/templates/virtual_environment/vms/controller02.xml
index d13d00a9..cec3c517 100644
--- a/templates/virtual_environment/vms/controller02.xml
+++ b/templates/virtual_environment/vms/controller02.xml
@@ -84,6 +84,10 @@
       <source network='daisy2' bridge='daisy2'/>
       <model type='rtl8139'/>
     </interface>
+    <interface type='network'>
+      <source network='daisy3' bridge='daisy3'/>
+      <model type='rtl8139'/>
+    </interface>
     <serial type='pty'>
       <source path='/dev/pts/4'/>
       <target port='0'/>
diff --git a/templates/virtual_environment/vms/controller03.xml b/templates/virtual_environment/vms/controller03.xml
index c0622c62..b86f82b9 100644
--- a/templates/virtual_environment/vms/controller03.xml
+++ b/templates/virtual_environment/vms/controller03.xml
@@ -84,6 +84,10 @@
       <source network='daisy2' bridge='daisy2'/>
       <model type='rtl8139'/>
     </interface>
+    <interface type='network'>
+      <source network='daisy3' bridge='daisy3'/>
+      <model type='rtl8139'/>
+    </interface>
     <serial type='pty'>
       <source path='/dev/pts/4'/>
       <target port='0'/>
-- 
cgit 1.2.3-korg