summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorshuai chen <chenshuai@huawei.com>2016-07-07 08:14:46 +0000
committerGerrit Code Review <gerrit@172.30.200.206>2016-07-07 08:14:46 +0000
commit2b39b7664eb219d2cc82258323906dbdb9e21ce8 (patch)
tree314671e05ce1bcd537f5186b3ed88dd801592801
parent86a45414358a9e6f36467621e5f0c24437433896 (diff)
parent68c872f91546416f6998b312421ecadee826a9fd (diff)
Merge "COMPASS-429 onos_cluster tasks are executed in none onos scenario"
-rwxr-xr-xdeploy/adapters/ansible/openstack_mitaka/roles/onos_cluster/tasks/main.yml5
1 files changed, 3 insertions, 2 deletions
diff --git a/deploy/adapters/ansible/openstack_mitaka/roles/onos_cluster/tasks/main.yml b/deploy/adapters/ansible/openstack_mitaka/roles/onos_cluster/tasks/main.yml
index 687d27d1..c8ce1155 100755
--- a/deploy/adapters/ansible/openstack_mitaka/roles/onos_cluster/tasks/main.yml
+++ b/deploy/adapters/ansible/openstack_mitaka/roles/onos_cluster/tasks/main.yml
@@ -18,6 +18,7 @@
- name: shut down and disable Neutron's agent services
service: name=neutron-plugin-openvswitch-agent state=stopped
+ when: groups['onos']|length !=0
ignore_errors: True
- name: remove neutron-l3-agent auto start
@@ -38,6 +39,7 @@
ovs-vsctl del-br br-tun ;
ovs-vsctl del-manager ;
ip link delete onos_port1 type veth peer name onos_port2;
+ when: groups['onos']|length !=0
ignore_errors: True
- name: Install ONOS Cluster on Controller
@@ -46,5 +48,4 @@
- name: Config ONOS Cluster
include: openvswitch.yml
- when: inventory_hostname in groups['onos']
-
+ when: groups['onos']|length !=0