From 87ce38a2450c9a403b7d50e0a45b65e64f6c306f Mon Sep 17 00:00:00 2001
From: CNlucius <lukai1@huawei.com>
Date: Fri, 1 Jan 2016 13:46:46 +0800
Subject: ONOSFW-152 Onos Intergrates with compass

Change-Id: Ia96f17754c3aef0a0b2f2013d430cb288d2d237d

Signed-off-by: CNlucius <lukai1@huawei.com>
---
 deploy/adapters/ansible/roles/onos_cluster/tasks/openvswitch.yml | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

(limited to 'deploy/adapters')

diff --git a/deploy/adapters/ansible/roles/onos_cluster/tasks/openvswitch.yml b/deploy/adapters/ansible/roles/onos_cluster/tasks/openvswitch.yml
index 77161a63..ec299835 100755
--- a/deploy/adapters/ansible/roles/onos_cluster/tasks/openvswitch.yml
+++ b/deploy/adapters/ansible/roles/onos_cluster/tasks/openvswitch.yml
@@ -66,7 +66,7 @@
     export OS_AUTH_URL=http://{{ internal_vip.ip }}:35357/v2.0;
     export OS_USERNAME=ADMIN;
     neutron net-create ext-net --shared --router:external=True;
-    neutron subnet-create ext-net --name ext-subnet {{ ip_settings[haproxy_hosts.keys()[0]]['external']['cidr'] }};
+    neutron subnet-create ext-net --name ext-subnet {{ public_net_info.floating_ip_cidr }};
   when: inventory_hostname == groups['controller'][0]
 
 - name: set gateway mac address
@@ -77,5 +77,7 @@
   when: inventory_hostname == groups['onos'][0]
 
 - name: delete default gateway
-  command: su -s /bin/sh -c "route delete dufault";
+  shell: >
+    route delete dufault;
+  when: inventory_hostname in groups['onos']
   ignore_errors: True
-- 
cgit 1.2.3-korg