aboutsummaryrefslogtreecommitdiffstats
path: root/deploy
diff options
context:
space:
mode:
authorshuai chen <chenshuai@huawei.com>2016-01-02 06:21:03 +0000
committerGerrit Code Review <gerrit@172.30.200.206>2016-01-02 06:21:03 +0000
commitaab654ea84b2e844eb8842d94370edd801b74b10 (patch)
tree3501047f643abe809f21a9a5b538947fedbeb133 /deploy
parent22b28e83de4a34f99715ccb7c2c7598f7d48698d (diff)
parent87ce38a2450c9a403b7d50e0a45b65e64f6c306f (diff)
Merge "ONOSFW-152 Onos Intergrates with compass"
Diffstat (limited to 'deploy')
-rwxr-xr-xdeploy/adapters/ansible/roles/onos_cluster/tasks/openvswitch.yml6
1 files changed, 4 insertions, 2 deletions
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