aboutsummaryrefslogtreecommitdiffstats
path: root/deploy/template/vm
diff options
context:
space:
mode:
authorJustin chi <chigang@huawei.com>2015-10-15 01:44:26 +0000
committerGerrit Code Review <gerrit@172.30.200.206>2015-10-15 01:44:26 +0000
commit4fde268319667485c8322661397ec8b5a2e3a05f (patch)
tree4180e58c03be2a1a02e0f26aa0266428bfa22dfc /deploy/template/vm
parent39794dc126a14a9b36f9ec1dc5ce760c717bf0b8 (diff)
parent6303b57e8d7f3530d9dfd0896708a712fdc8f919 (diff)
Merge "support connecting compass core and virtual machine by external ip"
Diffstat (limited to 'deploy/template/vm')
-rw-r--r--deploy/template/vm/compass.xml8
-rw-r--r--deploy/template/vm/host.xml8
2 files changed, 8 insertions, 8 deletions
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>