diff options
| author |   shuai chen <chenshuai@huawei.com> | 2015-12-04 06:08:54 +0000 |
|---|---|---|
| committer |   Gerrit Code Review <gerrit@172.30.200.206> | 2015-12-04 06:08:54 +0000 |
| commit | a140be4ebd89750f8a8fd745365bfc4d64f83bcb (patch) | |
| tree | 450752b42818c8eb9c890fed38ee2969f32956ab | |
| parent | a54fac4888df4f75e3c4230efb36618e64e695b1 (diff) | |
| parent | 5b1d2ed7edbbc51b56ecbc89409eed33a3530a62 (diff) | |
Merge "support onos l3 agent"
| -rw-r--r-- | deploy/conf/network_cfg.yaml | 1 | ||||
| -rw-r--r-- | deploy/host_virtual.sh | 1 | ||||
| -rw-r--r-- | deploy/template/vm/host.xml | 7 |
3 files changed, 8 insertions, 1 deletions
diff --git a/deploy/conf/network_cfg.yaml b/deploy/conf/network_cfg.yaml index d79ff8e5..9997f7fe 100644 --- a/deploy/conf/network_cfg.yaml +++ b/deploy/conf/network_cfg.yaml @@ -73,6 +73,7 @@ public_vip: netmask: "24" interface: external +onos_nic: eth2 public_net_info: enable: False network: ext-net diff --git a/deploy/host_virtual.sh b/deploy/host_virtual.sh index d769010b..4cb33613 100644 --- a/deploy/host_virtual.sh +++ b/deploy/host_virtual.sh @@ -31,6 +31,7 @@ function launch_host_vms() { -e "s#REPLACE_IMAGE#$vm_dir/disk.img#g" \ -e "s/REPLACE_BOOT_MAC/${mac_array[i]}/g" \ -e "s/REPLACE_NET_INSTALL/install/g" \ + -e "s/REPLACE_NET_IAAS/external/g" \ -e "s/REPLACE_NET_TENANT/external/g" \ $COMPASS_DIR/deploy/template/vm/host.xml\ > $vm_dir/libvirt.xml diff --git a/deploy/template/vm/host.xml b/deploy/template/vm/host.xml index e6eca551..f65d4f0e 100644 --- a/deploy/template/vm/host.xml +++ b/deploy/template/vm/host.xml @@ -32,10 +32,15 @@ <address type='pci' domain='0x0000' bus='0x00' slot='0x04' function='0x0'/> </interface> <interface type='network'> - <source network='REPLACE_NET_TENANT'/> + <source network='REPLACE_NET_IAAS'/> <model type='virtio'/> <address type='pci' domain='0x0000' bus='0x00' slot='0x05' function='0x0'/> </interface> + <interface type='network'> + <source network='REPLACE_NET_TENANT'/> + <model type='virtio'/> + <address type='pci' domain='0x0000' bus='0x00' slot='0x06' function='0x0'/> + </interface> <serial type='pty'> <source path='/dev/pts/0'/> </serial> |