From 5b1d2ed7edbbc51b56ecbc89409eed33a3530a62 Mon Sep 17 00:00:00 2001 From: "carey.xu" Date: Fri, 4 Dec 2015 10:31:33 +0800 Subject: support onos l3 agent JIRA: COMPASS-179 Change-Id: If052a122fce154f2327304a4436b6c6fdba6e7ac Signed-off-by: carey.xu --- deploy/conf/network_cfg.yaml | 1 + deploy/host_virtual.sh | 1 + deploy/template/vm/host.xml | 7 ++++++- 3 files changed, 8 insertions(+), 1 deletion(-) 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 @@
- +
+ + + +
+ -- cgit 1.2.3-korg