From 6303b57e8d7f3530d9dfd0896708a712fdc8f919 Mon Sep 17 00:00:00 2001
From: "carey.xu" <carey.xuhan@huawei.com>
Date: Tue, 13 Oct 2015 22:37:21 +0800
Subject: support connecting compass core and  virtual machine by external ip

JIRA: COMPASS-86

Change-Id: I53ac86242088d5d6f22f6d692a7e60ce97e07f6e
Signed-off-by: carey.xu <carey.xuhan@huawei.com>
---
 deploy/template/network/bridge_nic.xml | 6 ++++++
 deploy/template/vm/compass.xml         | 8 ++++----
 deploy/template/vm/host.xml            | 8 ++++----
 3 files changed, 14 insertions(+), 8 deletions(-)
 create mode 100644 deploy/template/network/bridge_nic.xml

(limited to 'deploy/template')

diff --git a/deploy/template/network/bridge_nic.xml b/deploy/template/network/bridge_nic.xml
new file mode 100644
index 00000000..055845fb
--- /dev/null
+++ b/deploy/template/network/bridge_nic.xml
@@ -0,0 +1,6 @@
+<network>
+<name>REPLACE_NAME</name>
+<forward mode="bridge">
+  <interface dev="REPLACE_NIC"/>
+</forward>
+</network>
diff --git a/deploy/template/vm/compass.xml b/deploy/template/vm/compass.xml
index 453e728d..182232f4 100644
--- a/deploy/template/vm/compass.xml
+++ b/deploy/template/vm/compass.xml
@@ -41,13 +41,13 @@
       <model type='virtio'/>
       <address type='pci' domain='0x0000' bus='0x00' slot='0x05' function='0x0'/>
     </interface>
-    <interface type='bridge'>
-        <source bridge='REPLACE_BRIDGE_INSTALL'/>
+    <interface type='network'>
+        <source network='REPLACE_NET_INSTALL'/>
         <model type='virtio'/>
       <address type='pci' domain='0x0000' bus='0x00' slot='0x06' function='0x0'/>
     </interface>
-    <interface type='bridge'>
-        <source bridge='REPLACE_BRIDGE_EXTERNAL'/>
+    <interface type='network'>
+        <source network='REPLACE_NET_EXTERNAL'/>
         <model type='virtio'/>
       <address type='pci' domain='0x0000' bus='0x00' slot='0x07' function='0x0'/>
     </interface>
diff --git a/deploy/template/vm/host.xml b/deploy/template/vm/host.xml
index 11b29f0c..e6eca551 100644
--- a/deploy/template/vm/host.xml
+++ b/deploy/template/vm/host.xml
@@ -25,14 +25,14 @@
       <source file='REPLACE_IMAGE'/>
       <target dev='vda' bus='virtio'/>
     </disk>
-    <interface type='bridge'>
+    <interface type='network'>
       <mac address=REPLACE_BOOT_MAC/>
-      <source bridge='REPLACE_BRIDGE_MGMT'/>
+      <source network='REPLACE_NET_INSTALL'/>
       <model type='virtio'/>
       <address type='pci' domain='0x0000' bus='0x00' slot='0x04' function='0x0'/>
     </interface>
-    <interface type='bridge'>
-      <source bridge='REPLACE_BRIDGE_TENANT'/>
+    <interface type='network'>
+      <source network='REPLACE_NET_TENANT'/>
       <model type='virtio'/>
       <address type='pci' domain='0x0000' bus='0x00' slot='0x05' function='0x0'/>
     </interface>
-- 
cgit 1.2.3-korg