From: CNlucius <lukai1@huawei.com>
Date: Sat, 2 Jan 2016 06:38:26 +0000 (+0800)
Subject: ONOSFW-152
X-Git-Tag: brahmaputra.1.0~90
X-Git-Url: https://gerrit.opnfv.org/gerrit/gitweb?a=commitdiff_plain;h=refs%2Fchanges%2F21%2F5421%2F1;p=compass4nfv.git

ONOSFW-152
Onos Intergrates with compass

Change-Id: Ia96f17754c3aef0a0b2f2013d430cb288d2d237d

Signed-off-by: CNlucius <lukai1@huawei.com>
---

diff --git a/deploy/adapters/ansible/roles/onos_cluster/tasks/openvswitch.yml b/deploy/adapters/ansible/roles/onos_cluster/tasks/openvswitch.yml
index ec299835..f8ed551f 100755
--- a/deploy/adapters/ansible/roles/onos_cluster/tasks/openvswitch.yml
+++ b/deploy/adapters/ansible/roles/onos_cluster/tasks/openvswitch.yml
@@ -78,6 +78,6 @@
 
 - name: delete default gateway
   shell: >
-    route delete dufault;
-  when: inventory_hostname in groups['onos']
+    route delete default;
+  when: inventory_hostname not in groups['onos']
   ignore_errors: True
diff --git a/deploy/adapters/ansible/roles/onos_cluster/templates/ml2_conf.sh b/deploy/adapters/ansible/roles/onos_cluster/templates/ml2_conf.sh
index 8ec9ae11..a9e61acb 100755
--- a/deploy/adapters/ansible/roles/onos_cluster/templates/ml2_conf.sh
+++ b/deploy/adapters/ansible/roles/onos_cluster/templates/ml2_conf.sh
@@ -1,5 +1,5 @@
 cat <<EOT>> /etc/neutron/plugins/ml2/ml2_conf.ini
-[ml2_onos]
+[onos]
 password = admin
 username = admin
 url_path = http://{{ ip_settings[groups['onos'][0]]['mgmt']['ip'] }}:8181/onos/vtn