From c846444991b2b691a0b01057ac2ecdd1dbbcca60 Mon Sep 17 00:00:00 2001 From: "chenshuai@huawei.com" Date: Thu, 25 Feb 2016 17:30:24 +0800 Subject: bugfix:remove openvswitch when enable opencontrail JIRA: COMPASS-322 Change-Id: Ie095bbba6e22bb583f3caa56a40feb9157b4150e Signed-off-by: chenshuai@huawei.com --- deploy/adapters/ansible/roles/open-contrail/tasks/main.yml | 4 ++++ 1 file changed, 4 insertions(+) (limited to 'deploy/adapters/ansible/roles/open-contrail/tasks/main.yml') diff --git a/deploy/adapters/ansible/roles/open-contrail/tasks/main.yml b/deploy/adapters/ansible/roles/open-contrail/tasks/main.yml index 968148f8..6c01f0f1 100755 --- a/deploy/adapters/ansible/roles/open-contrail/tasks/main.yml +++ b/deploy/adapters/ansible/roles/open-contrail/tasks/main.yml @@ -113,6 +113,10 @@ include: provision/provision-compute.yml when: groups['opencontrail']|length !=0 and inventory_hostname not in groups['opencontrail'] +- name: Remove openvswitch on compute + include: uninstall-openvswitch.yml + when: groups['opencontrail']|length !=0 and inventory_hostname not in groups['opencontrail'] + - name: Enable Service Daemon shell: if [ -f “\/opt\/service.bak” ] ; then mv /opt/service.bak /opt/service ; fi when: groups['opencontrail']|length !=0 -- cgit 1.2.3-korg