summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorCNlucius <lukai1@huawei.com>2016-01-02 14:38:26 +0800
committerCNlucius <lukai1@huawei.com>2016-01-02 14:39:03 +0800
commit617877977bb49b9a97f24b0fee583d104ef68891 (patch)
tree0a18ef7d9df3e60442abcd170fe50e8213a5aa9d
parentaab654ea84b2e844eb8842d94370edd801b74b10 (diff)
ONOSFW-152
Onos Intergrates with compass Change-Id: Ia96f17754c3aef0a0b2f2013d430cb288d2d237d Signed-off-by: CNlucius <lukai1@huawei.com>
-rwxr-xr-xdeploy/adapters/ansible/roles/onos_cluster/tasks/openvswitch.yml4
-rwxr-xr-xdeploy/adapters/ansible/roles/onos_cluster/templates/ml2_conf.sh2
2 files changed, 3 insertions, 3 deletions
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